x
/
sqlalchemy-migrate
Code Issues Proposed changes

Use raw strings when necessary. 

Python 3.6 deprecates invalid escapes in strings (previously they were just
ignored) and they will become errors in 3.8 or 3.9. When backslashes are
intended to be included literally, raw strings should be used.

Change-Id: Ife250d8eed3202e1ed0e4053fbae8a43d76c8998
Signed-off-by: Ben Wolsieffer <benwolsieffer@gmail.com>
This commit is contained in:
Ben Wolsieffer 2017-12-16 14:10:24 -05:00 committed by Matt Riedemann
parent f44d07956a
commit a50b7327c4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migrate/changeset/__init__.py
View File

@ -9,7 +9,7 @@ import re
import sqlalchemy
from sqlalchemy import __version__ as _sa_version
_sa_version = tuple(int(re.match("\d+", x).group(0)) for x in _sa_version.split("."))
_sa_version = tuple(int(re.match(r"\d+", x).group(0)) for x in _sa_version.split("."))
SQLA_07 = _sa_version >= (0, 7)
SQLA_08 = _sa_version >= (0, 8)
SQLA_09 = _sa_version >= (0, 9)

4
migrate/changeset/databases/sqlite.py
View File

@ -61,7 +61,7 @@ class SQLiteHelper(SQLiteCommon):
table_name=table.name
).fetchone()[0]
UNIQUE_PATTERN = "CONSTRAINT (\w+) UNIQUE \(([^\)]+)\)"
UNIQUE_PATTERN = r"CONSTRAINT (\w+) UNIQUE \(([^\)]+)\)"
constraints = []
for name, cols in re.findall(UNIQUE_PATTERN, data):
# Filter out any columns that were dropped from the table.
@ -69,7 +69,7 @@ class SQLiteHelper(SQLiteCommon):
if columns:
constraints.extend(UniqueConstraint(*columns, name=name))
FKEY_PATTERN = "CONSTRAINT (\w+) FOREIGN KEY \(([^\)]+)\)"
FKEY_PATTERN = r"CONSTRAINT (\w+) FOREIGN KEY \(([^\)]+)\)"
for name, cols in re.findall(FKEY_PATTERN, data):
# Filter out any columns that were dropped from the table.
columns = self._filter_columns(cols, table)

2
migrate/changeset/schema.py
View File

@ -200,7 +200,7 @@ class MyMeta(sqlalchemy.sql.visitors.VisitableType, abc.ABCMeta, object):
class ColumnDelta(six.with_metaclass(MyMeta, DictMixin, sqlalchemy.schema.SchemaItem)):
"""Extracts the differences between two columns/column-parameters
r"""Extracts the differences between two columns/column-parameters
May receive parameters arranged in several different ways:

2
migrate/versioning/script/sql.py
View File

@ -47,7 +47,7 @@ class SqlScript(base.BaseScript):
# (and committing transaction, which is contradictory to
# the whole idea of ROLLBACK)
ignored_statements = ('BEGIN', 'END', 'COMMIT')
ignored_regex = re.compile('^\s*(%s).*;?$' % '|'.join(ignored_statements),
ignored_regex = re.compile(r'^\s*(%s).*;?$' % '|'.join(ignored_statements),
re.IGNORECASE)
# NOTE(ihrachys): script may contain multiple statements, and