Convert is_directory back to a normal method instead of a property

albertyw · Feb 15, 2017 · 87a021a · 87a021a
1 parent ace9974
commit 87a021a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/git_browse/browse.py b/git_browse/browse.py
@@ -38,7 +38,7 @@ def get_url(self, focus_object):
         )
         if focus_object.is_root():
             return self.root_url(repository_url, focus_object)
-        if focus_object.is_directory:
+        if focus_object.is_directory():
             return self.directory_url(repository_url, focus_object)
         return self.file_url(repository_url, focus_object)
 
@@ -93,7 +93,6 @@ def __init__(self, path):
     def is_root(self):
         return self.path == os.sep
 
-    @property
     def is_directory(self):
         return self.path[-1] == os.sep
 

diff --git a/git_browse/tests/test.py b/git_browse/tests/test.py
@@ -64,11 +64,11 @@ def test_is_not_root(self):
 
     def test_is_directory(self):
         obj = browse.FocusObject('/asdf/')
-        self.assertTrue(obj.is_directory)
+        self.assertTrue(obj.is_directory())
 
     def test_is_not_directory(self):
         obj = browse.FocusObject('/asdf')
-        self.assertFalse(obj.is_directory)
+        self.assertFalse(obj.is_directory())
 
     def test_default(self):
         obj = browse.FocusObject.default()
@@ -164,20 +164,20 @@ def test_default_focus_object(self):
         sys_argv = ['asdf']
         focus_object = browse.get_focus_object(sys_argv, os.getcwd())
         self.assertTrue(focus_object.is_root())
-        self.assertTrue(focus_object.is_directory)
+        self.assertTrue(focus_object.is_directory())
 
     def test_file_focus_object(self):
         sys_argv = ['asdf', 'README.md']
         focus_object = browse.get_focus_object(sys_argv, os.getcwd())
         self.assertFalse(focus_object.is_root())
-        self.assertFalse(focus_object.is_directory)
+        self.assertFalse(focus_object.is_directory())
         self.assertEqual(focus_object.path[-9:], 'README.md')
 
     def test_directory_focus_object(self):
         sys_argv = ['asdf', '.']
         focus_object = browse.get_focus_object(sys_argv, os.getcwd())
         self.assertFalse(focus_object.is_root())
-        self.assertTrue(focus_object.is_directory)
+        self.assertTrue(focus_object.is_directory())
 
     def test_nonexistend_focus_object(self):
         sys_argv = ['asdf', 'asdf']