summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lepus.uberspace.de>2016-06-21 01:20:04 +0200
committerhut <hut@lepus.uberspace.de>2016-06-21 01:20:04 +0200
commit4611c89243cafee9fc81af11e1a3e96be3d61bd4 (patch)
tree08381bd499e3e994cc30c87833f97e88df17730d
parent92855e6d1179c425a5d70a5c7235027e2350753b (diff)
parent2278fa73c65dffda46b232c1cc1ff274ffbd7384 (diff)
downloadranger-4611c89243cafee9fc81af11e1a3e96be3d61bd4.tar.gz
Merge branch 'whitespace' of https://github.com/stepshal/ranger
-rw-r--r--ranger/api/commands.py2
-rw-r--r--ranger/core/actions.py8
-rw-r--r--tests/ranger/container/test_bookmarks.py4
3 files changed, 7 insertions, 7 deletions
diff --git a/ranger/api/commands.py b/ranger/api/commands.py
index 7021ed7c..6a9abe65 100644
--- a/ranger/api/commands.py
+++ b/ranger/api/commands.py
@@ -434,7 +434,7 @@ class AliasCommand(Command):
     _object_name = ""
     _function_name = "unknown"
     _line = ""
-    
+
     def execute(self):
         return self._make_cmd().execute()
 
diff --git a/ranger/core/actions.py b/ranger/core/actions.py
index 2c8371a0..d7385355 100644
--- a/ranger/core/actions.py
+++ b/ranger/core/actions.py
@@ -966,7 +966,7 @@ class Actions(FileManagerAware, SettingsAware):
                     path, str(width), str(height), cacheimg,
                     str(self.settings.preview_images)], read=True,
                     silent=True, descr="Getting preview of %s" % path)
-        
+
                 def on_after(signal):
                     exit = signal.process.poll()
                     content = signal.loader.stdout_buffer
@@ -1165,7 +1165,7 @@ class Actions(FileManagerAware, SettingsAware):
             contexts = 'browser', 'console', 'pager', 'taskview'
 
         temporary_file = tempfile.NamedTemporaryFile()
-        
+
         def write(string):
             temporary_file.write(string.encode('utf-8'))
 
@@ -1191,7 +1191,7 @@ class Actions(FileManagerAware, SettingsAware):
 
     def dump_commands(self):
         temporary_file = tempfile.NamedTemporaryFile()
-        
+
         def write(string):
             temporary_file.write(string.encode('utf-8'))
 
@@ -1217,7 +1217,7 @@ class Actions(FileManagerAware, SettingsAware):
 
     def dump_settings(self):
         temporary_file = tempfile.NamedTemporaryFile()
-        
+
         def write(string):
             temporary_file.write(string.encode('utf-8'))
 
diff --git a/tests/ranger/container/test_bookmarks.py b/tests/ranger/container/test_bookmarks.py
index cfaf3ba1..2c0f78bd 100644
--- a/tests/ranger/container/test_bookmarks.py
+++ b/tests/ranger/container/test_bookmarks.py
@@ -37,10 +37,10 @@ def testbookmarks(tmpdir):
 
     # We don't uneccesary update when the file on disk does not change
     origupdate = secondstore.update
-    
+
     class OutOfDateException(Exception):
         pass
-    
+
     def crash():
         raise OutOfDateException("Don't access me")
     secondstore.update = crash