renamed container.settingobject to container.settings

ranger.container.settingobject.SettingObject ->
ranger.container.settings.Settings

ranger.container.settingobject.LocalSettingObject ->
ranger.container.settings.LocalSettings

This is for more conformity.  No other class is called *Object.

4 files changed, 8 insertions, 9 deletions

diff --git a/ranger/container/directory.py b/ranger/container/directory.py
index 8223aeab..1b469ca5 100644
--- a/ranger/container/directory.py
+++ b/ranger/container/directory.py
@@ -16,7 +16,7 @@ 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
-from ranger.container.settingobject import LocalSettingObject
+from ranger.container.settings import LocalSettings
 
 def sort_by_basename(path):
     """returns path.basename (for sorting)"""
@@ -102,7 +102,7 @@ class Directory(FileSystemObject, Accumulator, Loadable, SettingsAware):
             self.settings.signal_bind('setopt.' + opt,
                 self.request_reload, weak=True, autosort=False)
 
-        self.settings = LocalSettingObject(path, self.settings)
+        self.settings = LocalSettings(path, self.settings)
 
         self.use()
 
diff --git a/ranger/container/settingobject.py b/ranger/container/settings.py
index 1a31efa0..d0b4be8d 100644
--- a/ranger/container/settingobject.py
+++ b/ranger/container/settings.py
@@ -63,7 +63,7 @@ DEFAULT_VALUES = {
     tuple: tuple([]),
 }
 
-class SettingObject(SignalDispatcher, FileManagerAware):
+class Settings(SignalDispatcher, FileManagerAware):
     def __init__(self):
         SignalDispatcher.__init__(self)
         self.__dict__['_localsettings'] = dict()
@@ -190,7 +190,7 @@ class SettingObject(SignalDispatcher, FileManagerAware):
         self._raw_set(signal.setting, signal.value, signal.path)
 
 
-class LocalSettingObject():
+class LocalSettings():
     def __init__(self, path, parent):
         self.__dict__['_parent'] = parent
         self.__dict__['_path'] = path
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 2c04f510..cbf97054 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -24,7 +24,7 @@ from ranger.core.shared import FileManagerAware, EnvironmentAware, \
 from ranger.core.tab import Tab
 from ranger.container.file import File
 from ranger.core.loader import CommandLoader, CopyLoader
-from ranger.container.settingobject import ALLOWED_SETTINGS
+from ranger.container.settings import ALLOWED_SETTINGS
 
 MACRO_FAIL = "<\x01\x01MACRO_HAS_NO_VALUE\x01\01>"
 
@@ -1021,7 +1021,6 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware):
         self.run([pager, temporary_file.name])
 
     def dump_settings(self):
-        from ranger.container.settingobject import ALLOWED_SETTINGS
         temporary_file = tempfile.NamedTemporaryFile()
         def write(string):
             temporary_file.write(string.encode('utf-8'))
diff --git a/ranger/core/main.py b/ranger/core/main.py
index 67377147..6f4c329d 100644
--- a/ranger/core/main.py
+++ b/ranger/core/main.py
@@ -10,7 +10,7 @@ def main():
     """initialize objects and run the filemanager"""
     import locale
     import ranger.api
-    from ranger.container.settingobject import SettingObject
+    from ranger.container.settings import Settings
     from ranger.core.shared import FileManagerAware, SettingsAware
     from ranger.core.fm import FM
 
@@ -53,7 +53,7 @@ def main():
                     sys.stdout.write(line)
         return 1 if arg.fail_unless_cd else 0 # COMPAT
 
-    SettingsAware._setup(SettingObject())
+    SettingsAware._setup(Settings())
 
     if arg.selectfile:
         arg.selectfile = os.path.abspath(arg.selectfile)
@@ -295,7 +295,7 @@ def load_settings(fm, clean):
         # options.py[oc] are deliberately ignored
         if os.path.exists(fm.confpath("options.py")):
             module = __import__('options')
-            from ranger.container.settingobject import ALLOWED_SETTINGS
+            from ranger.container.settings import ALLOWED_SETTINGS
             for setting in ALLOWED_SETTINGS:
                 if hasattr(module, setting):
                     fm.settings[setting] = getattr(module, setting)