summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-04-20 14:33:59 +0200
committerhut <hut@lavabit.com>2010-04-20 18:57:30 +0200
commitd528952a414cde9d704f736339c1dcbe18abd2ae (patch)
tree607fb7e3e0ad096345754ea854af2d811c4e7438
parent3e18db75fc47345e99a91d84017c594a99203239 (diff)
downloadranger-d528952a414cde9d704f736339c1dcbe18abd2ae.tar.gz
Move loader.py from ranger.fsobject to ranger.core
-rw-r--r--ranger/core/actions.py2
-rw-r--r--ranger/core/fm.py2
-rw-r--r--ranger/core/loader.py (renamed from ranger/fsobject/loader.py)0
-rw-r--r--ranger/fsobject/__init__.py1
4 files changed, 2 insertions, 3 deletions
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 115faaa0..00e4782b 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -27,7 +27,7 @@ from ranger.shared import FileManagerAware, EnvironmentAware, SettingsAware
 from ranger.gui.widgets import console_mode as cmode
 from ranger.fsobject import File
 from ranger.ext import shutil_generatorized as shutil_g
-from ranger.fsobject.loader import LoadableObject
+from ranger.core.loader import LoadableObject
 
 class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
 	search_method = 'ctime'
diff --git a/ranger/core/fm.py b/ranger/core/fm.py
index a426a9ae..0702e472 100644
--- a/ranger/core/fm.py
+++ b/ranger/core/fm.py
@@ -33,7 +33,7 @@ from ranger.ext.get_executables import get_executables
 from ranger.fsobject.directory import Directory
 from ranger.ext.signal_dispatcher import SignalDispatcher
 from ranger import __version__
-from ranger.fsobject import Loader
+from ranger.core.loader import Loader
 
 CTRL_C = 3
 TICKS_BEFORE_COLLECTING_GARBAGE = 100
diff --git a/ranger/fsobject/loader.py b/ranger/core/loader.py
index 4f4424e4..4f4424e4 100644
--- a/ranger/fsobject/loader.py
+++ b/ranger/core/loader.py
diff --git a/ranger/fsobject/__init__.py b/ranger/fsobject/__init__.py
index 6796f252..10997df6 100644
--- a/ranger/fsobject/__init__.py
+++ b/ranger/fsobject/__init__.py
@@ -29,4 +29,3 @@ class NotLoadedYet(Exception):
 from .fsobject import FileSystemObject
 from .file import File
 from .directory import Directory, NoDirectoryGiven
-from .loader import Loader