import join, remove trailing slash.

Author: tewalds

gitignore_parser.py

@@ -2,7 +2,7 @@
 import os
 import re
 
-from os.path import abspath, dirname
+from os.path import abspath, dirname, join
 from pathlib import Path
 from typing import Reversible, Union
 
@@ -19,7 +19,7 @@ def parse_gitignore(full_path, base_dir=None):
         return _parse_gitignore_lines(ignore_file, full_path, base_dir)
 
 def parse_gitignore_str(gitignore_str, base_dir):
-    full_path = os.path.join(base_dir, '.gitignore')
+    full_path = join(base_dir, '.gitignore')
     lines = gitignore_str.splitlines()
     return _parse_gitignore_lines(lines, full_path, base_dir)
 

tests.py

@@ -12,7 +12,7 @@ def test_simple(self):
         matches = parse_gitignore_str(
             '__pycache__/\n'
             '*.py[cod]',
-            base_dir='/home/michael/'
+            base_dir='/home/michael'
         )
         self.assertFalse(matches('/home/michael/main.py'))
         self.assertTrue(matches('/home/michael/main.pyc'))
@@ -30,7 +30,7 @@ def test_simple_parse_file(self):
             self.assertTrue(matches('/home/michael/__pycache__'))
 
     def test_incomplete_filename(self):
-        matches = parse_gitignore_str('o.py', base_dir='/home/michael/')
+        matches = parse_gitignore_str('o.py', base_dir='/home/michael')
         self.assertTrue(matches('/home/michael/o.py'))
         self.assertFalse(matches('/home/michael/foo.py'))
         self.assertFalse(matches('/home/michael/o.pyc'))
@@ -41,7 +41,7 @@ def test_incomplete_filename(self):
     def test_wildcard(self):
         matches = parse_gitignore_str(
             'hello.*',
-            base_dir='/home/michael/'
+            base_dir='/home/michael'
         )
         self.assertTrue(matches('/home/michael/hello.txt'))
         self.assertTrue(matches('/home/michael/hello.foobar/'))
@@ -53,7 +53,7 @@ def test_wildcard(self):
     def test_anchored_wildcard(self):
         matches = parse_gitignore_str(
             '/hello.*',
-            base_dir='/home/michael/'
+            base_dir='/home/michael'
         )
         self.assertTrue(matches('/home/michael/hello.txt'))
         self.assertTrue(matches('/home/michael/hello.c'))
@@ -66,7 +66,7 @@ def test_trailingspaces(self):
             'partiallyignoredspace\\  \n'
             'partiallyignoredspace2 \\  \n'
             'notignoredmultiplespace\\ \\ \\ ',
-            base_dir='/home/michael/'
+            base_dir='/home/michael'
         )
         self.assertTrue(matches('/home/michael/ignoretrailingspace'))
         self.assertFalse(matches('/home/michael/ignoretrailingspace '))
@@ -88,7 +88,7 @@ def test_comment(self):
                         '#realcomment\n'
                         'othermatch\n'
                         '\\#imnocomment',
-            base_dir='/home/michael/'
+            base_dir='/home/michael'
         )
         self.assertTrue(matches('/home/michael/somematch'))
         self.assertFalse(matches('/home/michael/#realcomment'))
@@ -97,7 +97,7 @@ def test_comment(self):
 
     def test_ignore_directory(self):
         matches = \
-            parse_gitignore_str('.venv/', base_dir='/home/michael/')
+            parse_gitignore_str('.venv/', base_dir='/home/michael')
         self.assertTrue(matches('/home/michael/.venv'))
         self.assertTrue(matches('/home/michael/.venv/folder'))
         self.assertTrue(matches('/home/michael/.venv/file.txt'))
@@ -106,7 +106,7 @@ def test_ignore_directory(self):
 
     def test_ignore_directory_asterisk(self):
         matches = \
-            parse_gitignore_str('.venv/*', base_dir='/home/michael/')
+            parse_gitignore_str('.venv/*', base_dir='/home/michael')
         self.assertFalse(matches('/home/michael/.venv'))
         self.assertTrue(matches('/home/michael/.venv/folder'))
         self.assertTrue(matches('/home/michael/.venv/file.txt'))
@@ -117,23 +117,23 @@ def test_negation(self):
 *.ignore
 !keep.ignore
             ''',
-            base_dir='/home/michael/'
+            base_dir='/home/michael'
         )
         self.assertTrue(matches('/home/michael/trash.ignore'))
         self.assertFalse(matches('/home/michael/keep.ignore'))
         self.assertTrue(matches('/home/michael/waste.ignore'))
 
     def test_literal_exclamation_mark(self):
         matches = parse_gitignore_str(
-            '\\!ignore_me!', base_dir='/home/michael/'
+            '\\!ignore_me!', base_dir='/home/michael'
         )
         self.assertTrue(matches('/home/michael/!ignore_me!'))
         self.assertFalse(matches('/home/michael/ignore_me!'))
         self.assertFalse(matches('/home/michael/ignore_me'))
 
     def test_double_asterisks(self):
         matches = parse_gitignore_str(
-            'foo/**/Bar', base_dir='/home/michael/'
+            'foo/**/Bar', base_dir='/home/michael'
         )
         self.assertTrue(matches('/home/michael/foo/hello/Bar'))
         self.assertTrue(matches('/home/michael/foo/world/Bar'))
@@ -142,7 +142,7 @@ def test_double_asterisks(self):
 
     def test_double_asterisk_without_slashes_handled_like_single_asterisk(self):
         matches = \
-            parse_gitignore_str('a/b**c/d', base_dir='/home/michael/')
+            parse_gitignore_str('a/b**c/d', base_dir='/home/michael')
         self.assertTrue(matches('/home/michael/a/bc/d'))
         self.assertTrue(matches('/home/michael/a/bXc/d'))
         self.assertTrue(matches('/home/michael/a/bbc/d'))
@@ -154,11 +154,11 @@ def test_double_asterisk_without_slashes_handled_like_single_asterisk(self):
 
     def test_more_asterisks_handled_like_single_asterisk(self):
         matches = \
-            parse_gitignore_str('***a/b', base_dir='/home/michael/')
+            parse_gitignore_str('***a/b', base_dir='/home/michael')
         self.assertTrue(matches('/home/michael/XYZa/b'))
         self.assertFalse(matches('/home/michael/foo/a/b'))
         matches = \
-            parse_gitignore_str('a/b***', base_dir='/home/michael/')
+            parse_gitignore_str('a/b***', base_dir='/home/michael')
         self.assertTrue(matches('/home/michael/a/bXYZ'))
         self.assertFalse(matches('/home/michael/a/b/foo'))
 
@@ -169,7 +169,7 @@ def test_directory_only_negation(self):
 !.gitkeep
 !data/01_raw/*
             ''',
-            base_dir='/home/michael/'
+            base_dir='/home/michael'
         )
         self.assertFalse(matches('/home/michael/data/01_raw/'))
         self.assertFalse(matches('/home/michael/data/01_raw/.gitkeep'))
@@ -181,21 +181,21 @@ def test_directory_only_negation(self):
         )
 
     def test_single_asterisk(self):
-        matches = parse_gitignore_str('*', base_dir='/home/michael/')
+        matches = parse_gitignore_str('*', base_dir='/home/michael')
         self.assertTrue(matches('/home/michael/file.txt'))
         self.assertTrue(matches('/home/michael/directory'))
         self.assertTrue(matches('/home/michael/directory-trailing/'))
 
     def test_supports_path_type_argument(self):
         matches = parse_gitignore_str(
-            'file1\n!file2', base_dir='/home/michael/'
+            'file1\n!file2', base_dir='/home/michael'
         )
         self.assertTrue(matches(Path('/home/michael/file1')))
         self.assertFalse(matches(Path('/home/michael/file2')))
 
     def test_slash_in_range_does_not_match_dirs(self):
         matches = parse_gitignore_str(
-            'abc[X-Z/]def', base_dir='/home/michael/'
+            'abc[X-Z/]def', base_dir='/home/michael'
         )
         self.assertFalse(matches('/home/michael/abcdef'))
         self.assertTrue(matches('/home/michael/abcXdef'))