2
0
Эх сурвалжийг харах

flake8: fix W605 (invalid escape sequences)

Thomas Waldmann 6 жил өмнө
parent
commit
5c66a60f79

+ 1 - 1
setup.cfg

@@ -6,7 +6,7 @@ python_files = testsuite/*.py
 # with existing code. if you want to change them, you should first fix all
 # flake8 failures that appear with your change.
 ignore = E122,E123,E125,E126,E127,E128,E226,E402,E722,E731,E741,F401,F405,F811,
-         W504,W605
+         W504
 # line length long term target: 120
 max-line-length = 255
 exclude = build,dist,.git,.idea,.cache,.tox,docs/conf.py

+ 6 - 6
src/borg/archiver.py

@@ -1978,7 +1978,7 @@ class Archiver:
 
         `Fnmatch <https://docs.python.org/3/library/fnmatch.html>`_, selector `fm:`
             This is the default style for ``--exclude`` and ``--exclude-from``.
-            These patterns use a variant of shell pattern syntax, with '\*' matching
+            These patterns use a variant of shell pattern syntax, with '\\*' matching
             any number of characters, '?' matching any single character, '[...]'
             matching any single character specified, including ranges, and '[!...]'
             matching any character not specified. For the purpose of these patterns,
@@ -1989,7 +1989,7 @@ class Archiver:
             from the start of the full path to just before a path separator. Except
             for the root path, paths will never end in the path separator when
             matching is attempted.  Thus, if a given pattern ends in a path
-            separator, a '\*' is appended before matching is attempted.
+            separator, a '\\*' is appended before matching is attempted.
 
         Shell-style patterns, selector `sh:`
             This is the default style for ``--pattern`` and ``--patterns-from``.
@@ -2064,7 +2064,7 @@ class Archiver:
 
             # The contents of directories in '/home' are not backed up when their name
             # ends in '.tmp'
-            $ borg create --exclude 're:^/home/[^/]+\.tmp/' backup /
+            $ borg create --exclude 're:^/home/[^/]+\\.tmp/' backup /
 
             # Load exclusions from file
             $ cat >exclude.txt <<EOF
@@ -2072,7 +2072,7 @@ class Archiver:
             /home/*/junk
             *.tmp
             fm:aa:something/*
-            re:^/home/[^/]\.tmp/
+            re:^/home/[^/]\\.tmp/
             sh:/home/*/.thumbnails
             EOF
             $ borg create --exclude-from exclude.txt backup /
@@ -3037,7 +3037,7 @@ class Archiver:
 
         The ``--exclude`` patterns are not like tar. In tar ``--exclude`` .bundler/gems will
         exclude foo/.bundler/gems. In borg it will not, you need to use ``--exclude``
-        '\*/.bundler/gems' to get the same effect. See ``borg help patterns`` for
+        '\\*/.bundler/gems' to get the same effect. See ``borg help patterns`` for
         more information.
 
         In addition to using ``--exclude`` patterns, it is possible to use
@@ -4074,7 +4074,7 @@ class Archiver:
 
         It creates input data below the given PATH and backups this data into the given REPO.
         The REPO must already exist (it could be a fresh empty repo or an existing repo, the
-        command will create / read / update / delete some archives named borg-test-data\* there.
+        command will create / read / update / delete some archives named borg-test-data* there.
 
         Make sure you have free space there, you'll need about 1GB each (+ overhead).
 

+ 2 - 2
src/borg/helpers/parseformat.py

@@ -414,9 +414,9 @@ class Location:
         return ', '.join(items)
 
     def to_key_filename(self):
-        name = re.sub('[^\w]', '_', self.path).strip('_')
+        name = re.sub(r'[^\w]', '_', self.path).strip('_')
         if self.proto != 'file':
-            name = re.sub('[^\w]', '_', self.host) + '__' + name
+            name = re.sub(r'[^\w]', '_', self.host) + '__' + name
         if len(name) > 100:
             # Limit file names to some reasonable length. Most file systems
             # limit them to 255 [unit of choice]; due to variations in unicode

+ 1 - 1
src/borg/testsuite/key.py

@@ -35,7 +35,7 @@ class TestKey:
         /cXJq7jrqmrJ1phd6dg4SHAM/i+hubadZoS6m25OQzYAW09wZD/phG8OVa698Z5ed3HTaT
         SmrtgJL3EoOKgUI9d6BLE4dJdBqntifo""".strip()
 
-    keyfile2_cdata = unhexlify(re.sub('\W', '', """
+    keyfile2_cdata = unhexlify(re.sub(r'\W', '', """
         0055f161493fcfc16276e8c31493c4641e1eb19a79d0326fad0291e5a9c98e5933
         00000000000003e8d21eaf9b86c297a8cd56432e1915bb
         """))

+ 3 - 3
src/borg/testsuite/patterns.py

@@ -229,13 +229,13 @@ def test_invalid_unicode_pattern(pattern):
       "",
       "# EOF"],
      ["/more/data", "/home", " #/wsfoobar"]),
-    (["re:.*"], []),
-    (["re:\s"], ["/data/something00.txt", "/more/data", "/home"]),
+    ([r"re:.*"], []),
+    ([r"re:\s"], ["/data/something00.txt", "/more/data", "/home"]),
     ([r"re:(.)(\1)"], ["/more/data", "/home", "\tstart/whitespace", "/whitespace/end\t"]),
     (["", "", "",
       "# This is a test with mixed pattern styles",
       # Case-insensitive pattern
-      "re:(?i)BAR|ME$",
+      r"re:(?i)BAR|ME$",
       "",
       "*whitespace*",
       "fm:*/something00*"],