about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2013-03-12 14:37:36 +0100
committerhut <hut@lavabit.com>2013-03-12 14:37:36 +0100
commit6154e8d6fb204f13c637df275718f978010df33a (patch)
tree5efc2d376c5533bf9bf81c6dc86a312b2fd1d4f1
parentf0a7599df497fa673cd08426be297362b1e1bf87 (diff)
downloadranger-6154e8d6fb204f13c637df275718f978010df33a.tar.gz
container.fsobject: make it "SettingsAware"
-rw-r--r--ranger/container/directory.py3
-rw-r--r--ranger/container/file.py3
-rw-r--r--ranger/container/fsobject.py4
3 files changed, 4 insertions, 6 deletions
diff --git a/ranger/container/directory.py b/ranger/container/directory.py
index 78ff82e5..970e16b4 100644
--- a/ranger/container/directory.py
+++ b/ranger/container/directory.py
@@ -12,7 +12,6 @@ from ranger.container.fsobject import BAD_INFO, FileSystemObject
 from ranger.core.loader import Loadable
 from ranger.ext.mount_path import mount_path
 from ranger.container.file import File
-from ranger.core.shared import SettingsAware
 from ranger.ext.accumulator import Accumulator
 from ranger.ext.lazy_property import lazy_property
 from ranger.ext.human_readable import human_readable
@@ -45,7 +44,7 @@ def accept_file(fname, directory, hidden_filter, name_filter):
         return False
     return True
 
-class Directory(FileSystemObject, Accumulator, Loadable, SettingsAware):
+class Directory(FileSystemObject, Accumulator, Loadable):
     is_directory = True
     enterable = False
     load_generator = None
diff --git a/ranger/container/file.py b/ranger/container/file.py
index b6a96a20..95d9b284 100644
--- a/ranger/container/file.py
+++ b/ranger/container/file.py
@@ -3,7 +3,6 @@
 
 import re
 from ranger.container.fsobject import FileSystemObject
-from ranger.core.shared import SettingsAware
 
 N_FIRST_BYTES = 256
 control_characters = set(chr(n) for n in
@@ -38,7 +37,7 @@ PREVIEW_WHITELIST = re.compile(r"""
         $
 """, re.VERBOSE | re.IGNORECASE)
 
-class File(FileSystemObject, SettingsAware):
+class File(FileSystemObject):
     is_file = True
     preview_data = None
     preview_known = False
diff --git a/ranger/container/fsobject.py b/ranger/container/fsobject.py
index f03fef7a..01f9348b 100644
--- a/ranger/container/fsobject.py
+++ b/ranger/container/fsobject.py
@@ -15,7 +15,7 @@ BAD_INFO = '?'
 import re
 from os import lstat, stat
 from os.path import abspath, basename, dirname, realpath, splitext, extsep
-from ranger.core.shared import FileManagerAware
+from ranger.core.shared import FileManagerAware, SettingsAware
 from ranger.ext.shell_escape import shell_escape
 from ranger.ext.spawn import spawn
 from ranger.ext.lazy_property import lazy_property
@@ -32,7 +32,7 @@ _extract_number_re = re.compile(r'([^0-9]?)(\d*)')
 def safe_path(path):
     return path.translate(_safe_string_table)
 
-class FileSystemObject(FileManagerAware):
+class FileSystemObject(FileManagerAware, SettingsAware):
     (basename,
     basename_lower,
     dirname,