From b11c671fb570757ca895d1f5b60f68a895bde9de Mon Sep 17 00:00:00 2001 From: hut Date: Sun, 18 Apr 2010 18:26:19 +0200 Subject: removed code for backwards compatibilty --- ranger/api/options.py | 12 ------------ ranger/core/actions.py | 36 ------------------------------------ ranger/gui/widgets/pager.py | 4 ---- ranger/shared/settings.py | 17 ----------------- 4 files changed, 69 deletions(-) diff --git a/ranger/api/options.py b/ranger/api/options.py index 4748823d..61026a4a 100644 --- a/ranger/api/options.py +++ b/ranger/api/options.py @@ -17,15 +17,3 @@ import re from re import compile as regexp from ranger import colorschemes as allschemes from ranger.gui import color - -class AttrToString(object): - """ - Purely for compatibility to 1.0.3. - """ - def __getattr__(self, attr): - print("NOTE: your configuration is out of date.") - print("instead of this: colorscheme = colorschemes." + attr) - print("please use a string: colorscheme = \"" + attr + "\"") - return attr - -colorschemes = AttrToString() diff --git a/ranger/core/actions.py b/ranger/core/actions.py index c87021bc..5b18fae4 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -32,42 +32,6 @@ class Actions(FileManagerAware, EnvironmentAware, SettingsAware): search_method = 'ctime' search_forward = False - # -------------------------- - # -- Backwards Compatibility - # -------------------------- - # All methods defined here are just for backwards compatibility, - # allowing old configuration files to work with newer versions. - # You can delete them and they should change nothing if you use - # an up-to-date configuration file. - - def dummy(self, *args, **keywords): - """For backwards compatibility only.""" - - handle_mouse = resize = dummy - - def move_left(self, narg=1): - """Enter the parent directory""" - self.move(left=1, narg=narg) - - def move_right(self, narg=None): - """Enter the current directory or execute the current file""" - self.move(right=1, narg=narg) - - def move_pointer(self, relative=0, absolute=None, narg=None): - """Move the pointer down by or to """ - dct = dict(down=relative, narg=narg) - if absolute is not None: - dct['to'] = absolute - self.move(**dct) - - def move_pointer_by_pages(self, relative): - """Move the pointer down by pages""" - self.move(down=relative, pages=True) - - def move_pointer_by_percentage(self, relative=0, absolute=None, narg=None): - """Move the pointer down to %""" - self.move(to=absolute, percentage=True, narg=narg) - # -------------------------- # -- Basic Commands # -------------------------- diff --git a/ranger/gui/widgets/pager.py b/ranger/gui/widgets/pager.py index 85022a01..00f3ec78 100644 --- a/ranger/gui/widgets/pager.py +++ b/ranger/gui/widgets/pager.py @@ -41,10 +41,6 @@ class Pager(Widget): self.markup = None self.lines = [] - def move_horizontal(self, *a, **k): - """For compatibility""" - self.fm.notify("Your keys.py is out of date. Can't scroll!", bad=True) - def open(self): self.scroll_begin = 0 self.markup = None diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py index df97238f..16167fe4 100644 --- a/ranger/shared/settings.py +++ b/ranger/shared/settings.py @@ -50,12 +50,6 @@ ALLOWED_SETTINGS = { } -COMPAT_MAP = { - 'sort_reverse': 'reverse', - 'sort_directories_first': 'directories_first', -} - - class SettingObject(SignalDispatcher): def __init__(self): SignalDispatcher.__init__(self) @@ -153,17 +147,6 @@ class SettingsAware(object): else: settings._setting_sources.append(my_options) - # For backward compatibility: - for new, old in COMPAT_MAP.items(): - try: - setattr(my_options, new, getattr(my_options, old)) - print("Warning: the option `{0}'"\ - " was renamed to `{1}'\nPlease update"\ - " your configuration file soon." \ - .format(old, new)) - except AttributeError: - pass - from ranger.defaults import options as default_options settings._setting_sources.append(default_options) assert all(hasattr(default_options, setting) \ -- cgit 1.4.1-2-gfad0