Merge branch 'reduntant' of https://github.com/stepshal/ranger

9 files changed, 0 insertions, 15 deletions

diff --git a/ranger/colorschemes/default.py b/ranger/colorschemes/default.py
index 1f5f3c8e..d04e5f6a 100644
--- a/ranger/colorschemes/default.py
+++ b/ranger/colorschemes/default.py
@@ -108,7 +108,6 @@ class Default(ColorScheme):
                 fg = cyan
                 attr &= ~bold
 
-
         if context.text:
             if context.highlight:
                 attr |= reverse
@@ -126,7 +125,6 @@ class Default(ColorScheme):
                 else:
                     bg = self.progress_bar_color
 
-
         if context.vcsfile and not context.selected:
             attr &= ~bold
             if context.vcsconflict:
diff --git a/ranger/container/bookmarks.py b/ranger/container/bookmarks.py
index 704c1c5f..b5e7dc72 100644
--- a/ranger/container/bookmarks.py
+++ b/ranger/container/bookmarks.py
@@ -72,7 +72,6 @@ class Bookmarks(object):
             del self.dct[key]
             if self.autosave: self.save()
 
-
     def __iter__(self):
         return iter(self.dct.items())
 
diff --git a/ranger/container/fsobject.py b/ranger/container/fsobject.py
index a61fc00a..2fd6ad26 100644
--- a/ranger/container/fsobject.py
+++ b/ranger/container/fsobject.py
@@ -121,7 +121,6 @@ class FileSystemObject(FileManagerAware, SettingsAware):
                     self._linemode = linemode
                     break
 
-
     def __repr__(self):
         return "<{0} {1}>".format(self.__class__.__name__, self.path)
 
diff --git a/ranger/container/settings.py b/ranger/container/settings.py
index 95aca140..402dd806 100644
--- a/ranger/container/settings.py
+++ b/ranger/container/settings.py
@@ -201,7 +201,6 @@ class Settings(SignalDispatcher, FileManagerAware):
             else:
                 return (typ, )
 
-
     def _check_type(self, name, value):
         typ = ALLOWED_SETTINGS[name]
         if isfunction(typ):
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 4bfc99c1..a1beddc8 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -94,7 +94,6 @@ class Actions(FileManagerAware, SettingsAware):
 
         self.settings.set(option_name, self._parse_option_value(option_name, value), localpath, tags)
 
-
     def _parse_option_value(self, name, value):
         types = self.fm.settings.types_of(name)
         if bool in types:
@@ -481,7 +480,6 @@ class Actions(FileManagerAware, SettingsAware):
                 if self.ui.pager.visible:
                     self.display_file()
 
-
     def move_parent(self, n, narg=None):
         self.change_mode('normal')
         if narg is not None:
@@ -932,7 +930,6 @@ class Actions(FileManagerAware, SettingsAware):
                 if data['loading']:
                     return None
 
-
             found = data.get((-1, -1), data.get((width, -1),
                 data.get((-1, height), data.get((width, height), False))))
             if found == False:
diff --git a/ranger/ext/img_display.py b/ranger/ext/img_display.py
index cf883900..61967b02 100644
--- a/ranger/ext/img_display.py
+++ b/ranger/ext/img_display.py
@@ -247,7 +247,6 @@ class ITerm2ImageDisplayer(ImageDisplayer, FileManagerAware):
         else:
             return width
 
-
     def _encode_image_content(self, path):
         """Read and encode the contents of path"""
         file = open(path, 'rb')
diff --git a/ranger/ext/rifle.py b/ranger/ext/rifle.py
index eadbc110..b1467c34 100755
--- a/ranger/ext/rifle.py
+++ b/ranger/ext/rifle.py
@@ -398,7 +398,6 @@ def main():
         else:
             conf_path = os.path.join(ranger.__path__[0], "config", "rifle.conf")
 
-
     # Evaluate arguments
     from optparse import OptionParser
     parser = OptionParser(usage="%prog [-fhlpw] [files]", version=__version__)
@@ -448,8 +447,6 @@ def main():
                 # TODO: implement interactive asking for file type?
                 print("Unknown file type: %s" % rifle._get_mimetype(positional[0]))
 
-
-
 if __name__ == '__main__':
     if 'RANGER_DOCTEST' in os.environ:
         import doctest
diff --git a/ranger/gui/widgets/statusbar.py b/ranger/gui/widgets/statusbar.py
index a1617aa8..c0c937de 100644
--- a/ranger/gui/widgets/statusbar.py
+++ b/ranger/gui/widgets/statusbar.py
@@ -230,8 +230,6 @@ class StatusBar(Widget):
             except KeyError:
                 return str(gid)
 
-
-
     def _get_right_part(self, bar):
         right = bar.right
         if self.column is None:
diff --git a/ranger/gui/widgets/taskview.py b/ranger/gui/widgets/taskview.py
index b748ae7a..654c63be 100644
--- a/ranger/gui/widgets/taskview.py
+++ b/ranger/gui/widgets/taskview.py
@@ -72,7 +72,6 @@ class TaskView(Widget, Accumulator):
         y = self.y + 1 + self.pointer - self.scroll_begin
         self.fm.ui.win.move(y, self.x)
 
-
     def task_remove(self, i=None):
         if i is None:
             i = self.pointer