bracex 3.2.2__tar.gz → 3.2.3__tar.gz

{bracex-3.2.2 → bracex-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: bracex
-Version: 3.2.2
+Version: 3.2.3
 Summary: Bash style brace expander.
 Project-URL: Homepage, https://github.com/facelessuser/bracex
 Author-email: Isaac Muse <Isaac.Muse@gmail.com>

{bracex-3.2.2 → bracex-3.2.3}/bracex/__init__.py

@@ -299,7 +299,8 @@ class ExpandBrace:
         try:
             escaped = next(i)
         except StopIteration:
-            escaped = ''
+            # Like Bash, a backslash with nothing after it to escape is kept as is.
+            return c
         return c + escaped if self.keep_escapes else escaped
 
     def squash(self, a: Iterable[str], b: Iterable[str]) -> Iterator[str]:

{bracex-3.2.2 → bracex-3.2.3}/bracex/__meta__.py

@@ -193,5 +193,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(3, 2, 2, "final")
+__version_info__ = Version(3, 2, 3, "final")
 __version__ = __version_info__._get_canonical()

{bracex-3.2.2 → bracex-3.2.3}/docs/src/markdown/about/changelog.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 3.2.3
+
+-   **FIX**: Keep a trailing backslash that has nothing to escape, such as in `{a,b}\`, like Bash 5.3 does. It was
+    previously dropped unless `keep_escapes` was enabled.
+
 ## 3.2.2
 
 -   **FIX**: Match Bash 5.3 for groups that contain a top level `..` but are not valid sequences. If the group starts

{bracex-3.2.2 → bracex-3.2.3}/tests/brace-cases.txt

@@ -362,3 +362,9 @@ x{{1..3}..b}y
 {1..3{a,b}}{c,d}
 {a,{b}..c}
 {x,{b}..c,y}
+{a,b,c}\\
+a\\
+\\
+a{b,c\\
+_\\{_\\,}_\\
+_\\\\{_\\\\,}_\\\\

{bracex-3.2.2 → bracex-3.2.3}/tests/brace-results.txt

@@ -1433,4 +1433,13 @@ A{b,{d,e},{f,g}}Z
 [{b}..c]><><><><{x,{b}..c,y}
 [x]
 [{b}..c]
-[y]><><><><
+[y]><><><><{a,b,c}\
+[a\]
+[b\]
+[c\]><><><><a\
+[a\]><><><><\
+[\]><><><><a{b,c\
+[a{b,c\]><><><><_\{_\,}_\
+[_{_,}_\]><><><><_\\{_\\,}_\\
+[_\_\_\]
+[_\_\]><><><><

{bracex-3.2.2 → bracex-3.2.3}/tests/generate.sh

@@ -16,7 +16,8 @@ cat brace-cases.txt | \
     if [ "${case:0:1}" = "#" ]; then
       continue;
     fi;
-    b="$($BASH -c 'for c in '"$case"'; do echo "[$c]"; done')"
+    # The case is evaluated as an argument so it can end with a backslash, which would otherwise escape what follows.
+    b="$($BASH -c 'eval "set -- $1"; for c in "$@"; do echo "[$c]"; done' _ "$case")"
     echo "$case"
     echo -n "$b><><><><";
   done > brace-results.txt

{bracex-3.2.2 → bracex-3.2.3}/tests/test_brace.py

@@ -113,9 +113,13 @@ class TestBraces:
         ['{b..k..2}', ['b', 'd', 'f', 'h', 'j']]
     ]
 
-    error_cases = [
-        # This would fail in bash, but we won't fail because we aren't Bash
-        ['{a,b,c}\\', ['a', 'b', 'c']]
+    trailing_backslash_cases = [
+        # Bash keeps a backslash that has nothing after it to escape: [pattern, result, result keeping escapes]
+        ['{a,b,c}\\', ['a\\', 'b\\', 'c\\'], ['a\\', 'b\\', 'c\\']],
+        ['a\\', ['a\\'], ['a\\']],
+        ['\\', ['\\'], ['\\']],
+        ['a{b,c\\', ['a{b,c\\'], ['a{b,c\\']],
+        ['_\\{_\\,}_\\', ['_{_,}_\\'], ['_\\{_\\,}_\\']]
     ]
 
     @staticmethod
@@ -147,11 +151,12 @@ class TestBraces:
         print('TEST: ', result, '<=^=>', goal, '\n')
         cls.assert_equal(result, goal)
 
-    @pytest.mark.parametrize("case", error_cases)
-    def test_internal_errors(self, case):
-        """Test trailing escape."""
+    @pytest.mark.parametrize("case", trailing_backslash_cases)
+    def test_trailing_backslash(self, case):
+        """Test that a trailing backslash is kept, with or without keeping escapes."""
 
-        self.eval_brace_cases(case)
+        self.assert_equal(bracex.expand(case[0]), case[1])
+        self.assert_equal(bracex.expand(case[0], keep_escapes=True), case[2])
 
     @pytest.mark.parametrize("case", dollar_cases)
     def test_dollar_expand(self, case):