Combine vim modelines and Python encoding declarations

Ref #314

docs/source/conf.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 import os
 import sys

font/fontpatcher.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python2
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 import argparse
 import sys

powerline/__init__.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from __future__ import absolute_import
 import json

powerline/bindings/ipython/post_0_11.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 from powerline.ipython import IpythonPowerline
 
 from IPython.core.prompts import PromptManager

powerline/bindings/ipython/pre_0_11.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 from powerline.ipython import IpythonPowerline
 from IPython.Prompts import BasePrompt
 from IPython.ipapi import get as get_ipython

powerline/bindings/qtile/widget.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from libqtile import bar
 from libqtile.widget import base

powerline/bindings/vim/__init__.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 try:
 	import vim

powerline/bindings/zsh/__init__.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 import zsh
 from powerline.shell import ShellPowerline
 from powerline.lib import parsedotval

powerline/colorscheme.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from copy import copy
 

powerline/ipython.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline import Powerline
 from powerline.lib import mergedicts

powerline/lib/__init__.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 from functools import wraps
 import json
 

powerline/lib/humanize_bytes.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from math import log
 unit_list = tuple(zip(['', 'k', 'M', 'G', 'T', 'P'], [0, 0, 1, 2, 2, 2]))

powerline/lib/memoize.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from functools import wraps
 import time

powerline/lib/url.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 
 def urllib_read(url):

powerline/lib/vcs/__init__.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 from __future__ import absolute_import
 import os
 from powerline.lib.memoize import memoize

powerline/lib/vcs/bzr.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 from __future__ import absolute_import, unicode_literals, division, print_function
 
 import sys

powerline/lib/vcs/git.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 try:
 	import pygit2 as git
 

powerline/lib/vcs/mercurial.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 from __future__ import absolute_import
 from mercurial import hg, ui, match
 

powerline/matcher.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from __future__ import absolute_import
 import sys

powerline/matchers/vim.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from __future__ import absolute_import
 

powerline/renderer.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.theme import Theme
 

powerline/renderers/bash_prompt.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.renderers.shell import ShellRenderer
 

powerline/renderers/ipython.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.renderers.shell import ShellRenderer
 

powerline/renderers/pango_markup.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.renderer import Renderer
 from powerline.colorscheme import ATTR_BOLD, ATTR_ITALIC, ATTR_UNDERLINE

powerline/renderers/shell.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.renderer import Renderer
 from powerline.colorscheme import ATTR_BOLD, ATTR_ITALIC, ATTR_UNDERLINE

powerline/renderers/tmux.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.renderer import Renderer
 from powerline.colorscheme import ATTR_BOLD, ATTR_ITALIC, ATTR_UNDERLINE

powerline/renderers/vim.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from __future__ import absolute_import
 

powerline/renderers/zsh_prompt.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.renderers.shell import ShellRenderer
 

powerline/segment.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from __future__ import absolute_import
 import sys

powerline/segments/common.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 import os
 import sys

powerline/segments/shell.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.theme import requires_segment_info
 

powerline/segments/vim.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from __future__ import absolute_import
 

powerline/shell.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline import Powerline
 from powerline.lib import mergedicts, parsedotval

powerline/theme.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from copy import copy
 

powerline/vim.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from __future__ import absolute_import
 

setup.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 import os
 import sys

tests/__init__.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 import sys
 if sys.version_info < (2, 7):
 	from unittest2 import TestCase, main  # NOQA

tests/lib/__init__.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 import imp
 import sys
 import os

tests/path/vim.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 from tests import vim
 
 

tests/test_configuration.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 '''Dynamic configuration files tests.'''
 

tests/test_lib.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 from powerline.lib import mergedicts, underscore_to_camelcase, add_divider_highlight_group, humanize_bytes
 from powerline.lib.vcs import guess
 from subprocess import call, PIPE

tests/test_segments.py

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 
 from powerline.segments import shell, common
 import tests.vim as vim_module

tests/vim.py

@@ -1,4 +1,4 @@
-# vim:fenc=utf-8:noet
+# vim:fileencoding=utf-8:noet
 _log = []
 _g = {}
 _window = 0