about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/__init__.py2
-rwxr-xr-xtests/manpage_completion_test.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/ranger/__init__.py b/ranger/__init__.py
index a3b01f9d..cc388d60 100644
--- a/ranger/__init__.py
+++ b/ranger/__init__.py
@@ -31,7 +31,7 @@ def version_helper():
             ) as git_describe:
                 (git_description, _) = git_describe.communicate()
             version_string = version_string.format(git_description.strip('\n'))
-        except (OSError, subprocess.CalledProcessError):
+        except (OSError, subprocess.CalledProcessError, AttributeError):
             version_string = version_string.format(__version__)
     return version_string
 
diff --git a/tests/manpage_completion_test.py b/tests/manpage_completion_test.py
index b9504d06..f5e5c335 100755
--- a/tests/manpage_completion_test.py
+++ b/tests/manpage_completion_test.py
@@ -26,7 +26,8 @@ def get_path_of_man_page():
 
 def read_manpage():
     path = get_path_of_man_page()
-    return open(path, 'r').read()
+    with open(path, 'r') as man_page:
+        return man_page.read()
 
 
 def get_sections():