Fix deprecation warnings from unallowed escapes

This commit is contained in:
Morten Enemark Lund 2018-10-05 11:51:08 +02:00
parent 4f9ab5d6c3
commit 3aa518bbad
3 changed files with 5 additions and 5 deletions

View file

@ -45,9 +45,9 @@ def ver_news(ver):
news += merge_news()
return news
VERSION_UPDATE_PATTERNS = [
('__version__\s*=.*', (lambda ver: "__version__ = '{0}'".format(ver)),
(r'__version__\s*=.*', (lambda ver: "__version__ = '{0}'".format(ver)),
[PROJECT, '__init__.py']),
('version:\s*', (lambda ver: 'version: {0}.{{build}}'.format(ver)),
(r'version:\s*', (lambda ver: 'version: {0}.{{build}}'.format(ver)),
['.appveyor.yml']),
('.. current developments', ver_news, ['CHANGELOG.rst']),
]

View file

@ -7,7 +7,7 @@ $ACTIVITIES = ['version_bump', 'changelog', 'pytest',
$VERSION_BUMP_PATTERNS = [
('.appveyor.yml', 'version:.*', 'version: $VERSION.{build}'),
('xonsh/__init__.py', '__version__\s*=.*', '__version__ = "$VERSION"'),
('xonsh/__init__.py', r'__version__\s*=.*', '__version__ = "$VERSION"'),
]
$CHANGELOG_FILENAME = 'CHANGELOG.rst'
$CHANGELOG_TEMPLATE = 'TEMPLATE.rst'

View file

@ -293,7 +293,7 @@ END_TOK_TYPES = LazyObject(
lambda: frozenset(["SEMI", "AND", "OR", "RPAREN"]), globals(), "END_TOK_TYPES"
)
RE_END_TOKS = LazyObject(
lambda: re.compile("(;|and|\&\&|or|\|\||\))"), globals(), "RE_END_TOKS"
lambda: re.compile(r"(;|and|\&\&|or|\|\||\))"), globals(), "RE_END_TOKS"
)
LPARENS = LazyObject(
lambda: frozenset(
@ -1613,7 +1613,7 @@ def dynamic_cwd_tuple_to_str(x):
RE_HISTORY_TUPLE = LazyObject(
lambda: re.compile("([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)\s*([A-Za-z]*)"),
lambda: re.compile(r"([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)\s*([A-Za-z]*)"),
globals(),
"RE_HISTORY_TUPLE",
)