summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-03-26 03:31:00 +0100
committerhut <hut@lavabit.com>2010-03-26 03:31:00 +0100
commite30d16cb17b54a77246caf7822da5e7179f22902 (patch)
tree0e9b1677f77661346b8825cc4240568cea53f60e
parent75682d43d3e99e8469ede7df9da31eccaf15180a (diff)
downloadranger-e30d16cb17b54a77246caf7822da5e7179f22902.tar.gz
ranger.__init__: don't implicitly import ranger.__main__
-rwxr-xr-xranger.py2
-rw-r--r--ranger/__init__.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/ranger.py b/ranger.py
index 9703b243..0a9d54c9 100755
--- a/ranger.py
+++ b/ranger.py
@@ -45,7 +45,7 @@ __doc__ = """Ranger - file browser for the unix terminal"""
 # is neither in the same directory as this file, nor in one of
 # pythons global import paths.
 try:
-	from ranger import main
+	from ranger.__main__ import main
 
 except ImportError:
 	import sys
diff --git a/ranger/__init__.py b/ranger/__init__.py
index e2a4983d..d1300cb4 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -64,6 +64,3 @@ def relpath_conf(*paths):
 def relpath(*paths):
 	"""returns the path relative to rangers library directory"""
 	return os.path.join(RANGERDIR, *paths)
-
-
-from ranger.__main__ import main