summary refs log tree commit diff stats
path: root/ranger/container/directory.py
diff options
context:
space:
mode:
authornfnty <git@nfnty.se>2017-01-15 23:09:58 +0100
committernfnty <git@nfnty.se>2017-01-17 05:59:04 +0100
commit84a22ae0c78b087b0cb080f47620291833586e6f (patch)
tree95b6c55d171d61d9c1c6b552ce17c2e34ba21acc /ranger/container/directory.py
parent52403c53841a30edf550f5610e33e6c0981caad1 (diff)
downloadranger-84a22ae0c78b087b0cb080f47620291833586e6f.tar.gz
linting: pylint 2.0.0
Diffstat (limited to 'ranger/container/directory.py')
-rw-r--r--ranger/container/directory.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/ranger/container/directory.py b/ranger/container/directory.py
index 44ca45fe..1fa9065f 100644
--- a/ranger/container/directory.py
+++ b/ranger/container/directory.py
@@ -217,12 +217,13 @@ class Directory(  # pylint: disable=too-many-instance-attributes,too-many-public
         self._gc_marked_items()
         if not self.files:
             return []
+
         if self.marked_items:
             return [item for item in self.files if item.marked]
         elif self.pointed_obj:
             return [self.pointed_obj]
-        else:
-            return []
+
+        return []
 
     def refilter(self):
         if self.files_all is None:
@@ -360,10 +361,8 @@ class Directory(  # pylint: disable=too-many-instance-attributes,too-many-public
                                         is_directory=True,
                                     )
                     else:
-                        item = File(  # pylint: disable=redefined-variable-type
-                            name, preload=stats, path_is_abs=True,
-                            basename_is_rel_to=basename_is_rel_to
-                        )
+                        item = File(name, preload=stats, path_is_abs=True,
+                                    basename_is_rel_to=basename_is_rel_to)
                         item.load()
                         disk_usage += item.size
                         if self.vcs and self.vcs.track: