summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2011-10-10 23:40:08 +0200
committerhut <hut@lavabit.com>2011-10-10 23:40:08 +0200
commit5fd44f5ad9093dee5f62d37c0e89d95e8da8d64f (patch)
tree3270770f622c9abccdf3ca8f47d6d6d8809bbc18
parent28af9c88ecd6a2372a18bc7b8a5040f5a42d2f27 (diff)
downloadranger-5fd44f5ad9093dee5f62d37c0e89d95e8da8d64f.tar.gz
container.__init__: removed import shortcuts
-rw-r--r--ranger/container/__init__.py2
-rw-r--r--ranger/core/environment.py2
-rw-r--r--ranger/core/fm.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/ranger/container/__init__.py b/ranger/container/__init__.py
index 21a336bc..62ddc67a 100644
--- a/ranger/container/__init__.py
+++ b/ranger/container/__init__.py
@@ -2,5 +2,3 @@
 This package includes container-objects which are
 used to manage stored data
 """
-from ranger.container.history import History
-from .bookmarks import Bookmarks
diff --git a/ranger/core/environment.py b/ranger/core/environment.py
index 8ea8fd65..1f37bde5 100644
--- a/ranger/core/environment.py
+++ b/ranger/core/environment.py
@@ -21,7 +21,7 @@ from os.path import abspath, normpath, join, expanduser, isdir
 
 from ranger.fsobject import Directory
 from ranger.ext.keybinding_parser import KeyBuffer, KeyMaps
-from ranger.container import History
+from ranger.container.history import History
 from ranger.ext.signals import SignalDispatcher
 from ranger.core.shared import SettingsAware
 
diff --git a/ranger/core/fm.py b/ranger/core/fm.py
index a8cba91b..4383a9ab 100644
--- a/ranger/core/fm.py
+++ b/ranger/core/fm.py
@@ -29,7 +29,7 @@ from ranger import *
 from ranger.core.actions import Actions
 from ranger.container.tags import Tags
 from ranger.gui.ui import UI
-from ranger.container import Bookmarks
+from ranger.container.bookmarks import Bookmarks
 from ranger.core.runner import Runner
 from ranger.ext.get_executables import get_executables
 from ranger.fsobject import Directory