Use relative imports (#102)

Author: deathaxe

editorconfig/__init__.py

@@ -1,6 +1,6 @@
 """EditorConfig Python Core"""
 
-from editorconfig.versiontools import join_version
+from .versiontools import join_version
 
 VERSION = (0, 12, 2, "final")
 
@@ -15,5 +15,5 @@ def get_properties(filename):
     return handler.get_configurations()
 
 
-from editorconfig.handler import EditorConfigHandler
-from editorconfig.exceptions import *
+from .handler import EditorConfigHandler
+from .exceptions import *

editorconfig/handler.py

@@ -9,9 +9,9 @@
 
 import os
 
-from editorconfig import VERSION
-from editorconfig.exceptions import PathError, VersionError
-from editorconfig.ini import EditorConfigParser
+from . import VERSION
+from .exceptions import PathError, VersionError
+from .ini import EditorConfigParser
 
 
 __all__ = ['EditorConfigHandler']

editorconfig/ini.py

@@ -20,9 +20,9 @@
 from os import sep
 from os.path import dirname, normpath
 
-from editorconfig.compat import u
-from editorconfig.exceptions import ParsingError
-from editorconfig.fnmatch import fnmatch
+from .compat import u
+from .exceptions import ParsingError
+from .fnmatch import fnmatch
 
 
 __all__ = ["ParsingError", "EditorConfigParser"]

editorconfig/main.py

@@ -7,11 +7,11 @@
 import getopt
 import sys
 
-from editorconfig import VERSION, __version__
-from editorconfig.compat import force_unicode
-from editorconfig.exceptions import ParsingError, PathError, VersionError
-from editorconfig.handler import EditorConfigHandler
-from editorconfig.versiontools import split_version
+from . import VERSION, __version__
+from .compat import force_unicode
+from .exceptions import ParsingError, PathError, VersionError
+from .handler import EditorConfigHandler
+from .versiontools import split_version
 
 
 def version():

EditorConfig.py plugin.pyEditorConfig.py renamed to plugin.py

@@ -1,19 +1,7 @@
 import pprint
 import sublime
 import sublime_plugin
-
-def unexpanduser(path):
-	from os.path import expanduser
-	return path.replace(expanduser('~'), '~')
-
-try:
-	import os, sys
-	# stupid python module system
-	sys.path.append(os.path.dirname(os.path.realpath(__file__)))
-	from .editorconfig import get_properties, EditorConfigError
-except:
-	# Python 2
-	from editorconfig import get_properties, EditorConfigError
+from .editorconfig import get_properties, EditorConfigError
 
 LINE_ENDINGS = {
 	'lf': 'unix',
@@ -29,6 +17,10 @@ def unexpanduser(path):
 	'utf-16le': 'utf-16 le'
 }
 
+def unexpanduser(path):
+	from os.path import expanduser
+	return path.replace(expanduser('~'), '~')
+
 def log(msg):
 	print('EditorConfig: %s' % msg)
 
@@ -119,5 +111,5 @@ def apply_config(self, view, config):
 
 class RemoveFinalNewlinesCommand(sublime_plugin.TextCommand):
 	def run(self, edit):
-		region = self.view.find('\n*\Z', 0)
+		region = self.view.find(r'\n*\Z', 0)
 		self.view.erase(edit, region)