Mercurial > hg-stable
changeset 30132:72f75eda02ba
py3: use raw strings in line continuation (convert ext)
Our py2 to py3 string translations marks those as bytestrings.
author | Mateusz Kwapich <mitrandir@fb.com> |
---|---|
date | Mon, 10 Oct 2016 05:31:31 -0700 |
parents | 85d5708eae4e |
children | f6dcda7505f9 |
files | hgext/convert/subversion.py tests/test-check-py3-compat.t |
diffstat | 2 files changed, 3 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Mon Oct 10 05:30:14 2016 -0700 +++ b/hgext/convert/subversion.py Mon Oct 10 05:31:31 2016 -0700 @@ -531,8 +531,8 @@ def checkrevformat(self, revstr, mapname='splicemap'): """ fails if revision format does not match the correct format""" if not re.match(r'svn:[0-9a-f]{8,8}-[0-9a-f]{4,4}-' - '[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]' - '{12,12}(.*)\@[0-9]+$',revstr): + r'[0-9a-f]{4,4}-[0-9a-f]{4,4}-[0-9a-f]' + r'{12,12}(.*)\@[0-9]+$',revstr): raise error.Abort(_('%s entry %s is not a valid revision' ' identifier') % (mapname, revstr))
--- a/tests/test-check-py3-compat.t Mon Oct 10 05:30:14 2016 -0700 +++ b/tests/test-check-py3-compat.t Mon Oct 10 05:31:31 2016 -0700 @@ -16,24 +16,10 @@ $ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \ > | xargs $PYTHON3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' - hgext/convert/bzr.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/convert/convcmd.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/convert/subversion.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/convert/transport.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) + hgext/convert/transport.py: error importing: <ImportError> No module named 'svn.client' (error at transport.py:*) hgext/fsmonitor/pywatchman/capabilities.py: error importing: <ImportError> No module named 'pybser' (error at __init__.py:*) hgext/fsmonitor/pywatchman/pybser.py: error importing: <ImportError> No module named 'pybser' (error at __init__.py:*) hgext/fsmonitor/watchmanclient.py: error importing: <ImportError> No module named 'pybser' (error at __init__.py:*) - hgext/largefiles/basestore.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/lfcommands.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/lfutil.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/localstore.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/overrides.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/proto.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/remotestore.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/reposetup.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/storefactory.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/uisetup.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) - hgext/largefiles/wirestore.py: error importing: <SyntaxError> cannot mix bytes and nonbytes literals (subversion.py, line 533) (error at convcmd.py:*) hgext/mq.py: error importing: <TypeError> __import__() argument 1 must be str, not bytes (error at extensions.py:*) mercurial/scmwindows.py: error importing: <ImportError> No module named 'winreg' (error at scmwindows.py:*) mercurial/win32.py: error importing: <ImportError> No module named 'msvcrt' (error at win32.py:*)