As string is iterable, changed to isinstance check

test now works
gitpython-developers · Oct 15, 2019 · d759e17181c21379d7274db76d4168cdbb403ccf · d759e17
1 parent 1fa1ce2
commit d759e17181c21379d7274db76d4168cdbb403ccf
Showing with 14 additions and 14 deletions.

+2 −0 .gitignore

+3 −3 .gitmodules

+4 −8 git/index/base.py

+5 −3 git/test/test_index.py
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ nbproject
 /*egg-info
 /.tox
 /.vscode/
+.idea/
+.cache/
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "gitdb"]
-	url = https://github.com/gitpython-developers/gitdb.git
-	path = git/ext/gitdb
+[submodule "gitdb"]
+	url = https://github.com/gitpython-developers/gitdb.git
+	path = git/ext/gitdb
diff --git a/git/index/base.py b/git/index/base.py
@@ -569,10 +569,8 @@ def _preprocess_add_items(self, items):
         """ Split the items into two lists of path strings and BaseEntries. """
         paths = []
         entries = []
-        # check if is iterable, else put in list
-        try:
-            test_item = iter(items)
-        except TypeError:
+        # if it is a string put in list
+        if isinstance(items, str):
             items = [items]
 
         for item in items:
@@ -806,10 +804,8 @@ def _items_to_rela_paths(self, items):
         """Returns a list of repo-relative paths from the given items which
         may be absolute or relative paths, entries or blobs"""
         paths = []
-        # check if is iterable, else put in list
-        try:
-            test_item = iter(items)
-        except TypeError:
+        # if string put in list
+        if isinstance(items, str):
             items = [items]
 
         for item in items:

diff --git a/git/test/test_index.py b/git/test/test_index.py
@@ -775,9 +775,11 @@ def test_compare_write_tree(self, rw_repo):
 
     @with_rw_repo('HEAD', bare=False)
     def test_index_single_addremove(self, rw_repo):
-        path = osp.join('git', 'test', 'test_index.py')
-        self._assert_entries(rw_repo.index.add(path))
-        deleted_files = rw_repo.index.remove(path)
+        fp = osp.join(rw_repo.working_dir, 'testfile.txt')
+        with open(fp, 'w') as fs:
+            fs.write(u'content of testfile')
+        self._assert_entries(rw_repo.index.add(fp))
+        deleted_files = rw_repo.index.remove(fp)
         assert deleted_files
 
     def test_index_new(self):