summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2016-06-21 00:57:33 +0200
committerhut <hut@lepus.uberspace.de>2016-06-21 00:57:33 +0200
commit12e745e3360fa0eb9179668243ec9e9a7aef41b3 (patch)
treeae8fbd6ed77473603fc4871927a3d7e143c257c9
parent726eecb653b684a9af58c8574caf59e2f1ebff74 (diff)
parent0fc00f8acc21a45e721011f4d84099c4d7cc4679 (diff)
downloadranger-12e745e3360fa0eb9179668243ec9e9a7aef41b3.tar.gz
Merge branch 'E251' of https://github.com/stepshal/ranger
-rwxr-xr-xranger/config/commands.py8
-rw-r--r--ranger/container/directory.py4
-rw-r--r--ranger/core/tab.py2
-rw-r--r--ranger/ext/img_display.py18
4 files changed, 16 insertions, 16 deletions
diff --git a/ranger/config/commands.py b/ranger/config/commands.py
index cb4fd3a8..06cc8059 100755
--- a/ranger/config/commands.py
+++ b/ranger/config/commands.py
@@ -243,10 +243,10 @@ class open_with(Command):
     def execute(self):
         app, flags, mode = self._get_app_flags_mode(self.rest(1))
         self.fm.execute_file(
-                files = [f for f in self.fm.thistab.get_selection()],
-                app = app,
-                flags = flags,
-                mode = mode)
+                files=[f for f in self.fm.thistab.get_selection()],
+                app=app,
+                flags=flags,
+                mode=mode)
 
     def tab(self, tabnum):
         return self._tab_through_executables()
diff --git a/ranger/container/directory.py b/ranger/container/directory.py
index 4ffd9bc2..908b6c1e 100644
--- a/ranger/container/directory.py
+++ b/ranger/container/directory.py
@@ -460,13 +460,13 @@ class Directory(FileSystemObject, Accumulator, Loadable):
             elif sort_func in (sort_by_basename, sort_by_basename_icase):
                 sort_func = sort_unicode_wrapper_string(sort_func)
 
-        self.files_all.sort(key = sort_func)
+        self.files_all.sort(key=sort_func)
 
         if self.settings.sort_reverse:
             self.files_all.reverse()
 
         if self.settings.sort_directories_first:
-            self.files_all.sort(key = sort_by_directory)
+            self.files_all.sort(key=sort_by_directory)
 
         self.refilter()
 
diff --git a/ranger/core/tab.py b/ranger/core/tab.py
index dc76568b..2faf4b0c 100644
--- a/ranger/core/tab.py
+++ b/ranger/core/tab.py
@@ -103,7 +103,7 @@ class Tab(FileManagerAware, SettingsAware):
     def inherit_history(self, other_history):
         self.history.rebase(other_history)
 
-    def enter_dir(self, path, history = True):
+    def enter_dir(self, path, history=True):
         """Enter given path"""
         # TODO: Ensure that there is always a self.thisdir
         if path is None: return
diff --git a/ranger/ext/img_display.py b/ranger/ext/img_display.py
index 61967b02..1ee421d7 100644
--- a/ranger/ext/img_display.py
+++ b/ranger/ext/img_display.py
@@ -114,11 +114,11 @@ class W3MImageDisplayer(ImageDisplayer):
         fontw, fonth = self._get_font_dimensions()
 
         cmd = "6;{x};{y};{w};{h}\n4;\n3;\n".format(
-                x = int((start_x - 0.2) * fontw),
-                y = start_y * fonth,
+                x=int((start_x - 0.2) * fontw),
+                y=start_y * fonth,
                 # y = int((start_y + 1) * fonth), # (for tmux top status bar)
-                w = int((width + 0.4) * fontw),
-                h = height * fonth + 1)
+                w=int((width + 0.4) * fontw),
+                h=height * fonth + 1)
                 # h = (height - 1) * fonth + 1) # (for tmux top status bar)
 
         try:
@@ -168,12 +168,12 @@ class W3MImageDisplayer(ImageDisplayer):
             height = max_height_pixels
 
         return "0;1;{x};{y};{w};{h};;;;;{filename}\n4;\n3;\n".format(
-                x = int((start_x - 0.2) * fontw),
-                y = start_y * fonth,
+                x=int((start_x - 0.2) * fontw),
+                y=start_y * fonth,
                 # y = (start_y + 1) * fonth, # (for tmux top status bar)
-                w = width,
-                h = height,
-                filename = path)
+                w=width,
+                h=height,
+                filename=path)
 
     def quit(self):
         if self.is_initialized and self.process and self.process.poll() is None: