Merge pull request #103 from lsst/tickets/DM-16296-daf_persistence

DM-16296: Fix bad string escape and ignore W504
lsst-dm · Oct 24, 2018 · a55db4c · a55db4c
2 parents 52c50f7 + e390c27
commit a55db4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/python/lsst/daf/persistence/fsScanner.py b/python/lsst/daf/persistence/fsScanner.py
@@ -87,10 +87,10 @@ def __init__(self, pathTemplate):
                 self.reString += r'(?P<' + fieldName + '>.+)'
             elif m.group(2) in 'eEfFgG':
                 fieldType = float
-                self.reString += r'(?P<' + fieldName + '>[\d.eE+-]+)'
+                self.reString += r'(?P<' + fieldName + r'>[\d.eE+-]+)'
             else:
                 fieldType = int
-                self.reString += r'(?P<' + fieldName + '>[\d+-]+)'
+                self.reString += r'(?P<' + fieldName + r'>[\d+-]+)'
 
             self.fields[fieldName] = dict(pos=pos, fieldType=fieldType)
             pos += 1

diff --git a/setup.cfg b/setup.cfg
@@ -1,8 +1,8 @@
 [flake8]
 max-line-length = 110
-ignore = E133, E226, E228, N802, N803, N806
+ignore = E133, E226, E228, N802, N803, N806, W504
 exclude = __init__.py
 
 [tool:pytest]
 addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806
+flake8-ignore = E133 E226 E228 N802 N803 N806 W504