diff options
| author | hut <hut@lepus.uberspace.de> | 2016-06-21 01:09:08 +0200 |
|---|---|---|
| committer | hut <hut@lepus.uberspace.de> | 2016-06-21 01:09:08 +0200 |
| commit | 13d48f74f39d2d98bfb5050818afcebda40cf710 (patch) | |
| tree | 5040665292dce54e8a53eeef4740815ca28524bf | |
| parent | f1aabc21f3a6e39c7cf07c2c3ae7cdb8a8da4928 (diff) | |
| parent | 54bd26be79e83f04e9be147151aa4a57ba1d257d (diff) | |
| download | ranger-13d48f74f39d2d98bfb5050818afcebda40cf710.tar.gz | |
Merge branch 'comparison' of https://github.com/stepshal/ranger
| -rw-r--r-- | ranger/container/fsobject.py | 2 | ||||
| -rw-r--r-- | ranger/core/actions.py | 4 | ||||
| -rw-r--r-- | ranger/gui/widgets/console.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ranger/container/fsobject.py b/ranger/container/fsobject.py index 2fd6ad26..272e1b21 100644 --- a/ranger/container/fsobject.py +++ b/ranger/container/fsobject.py @@ -91,7 +91,7 @@ class FileSystemObject(FileManagerAware, SettingsAware): path = abspath(path) self.path = path self.basename = basename(path) - if basename_is_rel_to == None: + if basename_is_rel_to is None: self.relative_path = self.basename else: self.relative_path = relpath(path, basename_is_rel_to) diff --git a/ranger/core/actions.py b/ranger/core/actions.py index 6e89d997..0c2e5ce1 100644 --- a/ranger/core/actions.py +++ b/ranger/core/actions.py @@ -121,7 +121,7 @@ class Actions(FileManagerAware, SettingsAware): """ if self.mode == 'normal': self._visual_reverse = reverse - if narg != None: + if narg is not None: self.mark_files(val=not reverse, narg=narg) self.change_mode('visual') else: @@ -645,7 +645,7 @@ class Actions(FileManagerAware, SettingsAware): if val is None and toggle is False: return - if narg == None: + if narg is None: narg = 1 else: all = False diff --git a/ranger/gui/widgets/console.py b/ranger/gui/widgets/console.py index 64474ac7..8bb37937 100644 --- a/ranger/gui/widgets/console.py +++ b/ranger/gui/widgets/console.py @@ -469,7 +469,7 @@ class Console(Widget): self.pos = len(tab_result) self.on_line_change() - elif tab_result == None: + elif tab_result is None: pass elif hasattr(tab_result, '__iter__'): |