Patchwork D2526: convcmd: use our shlex wrapper to avoid Python 3 tracebacks

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 1:54 a.m.
Message ID <c7bb1ec9f1c2617bce373c47061892af@localhost.localdomain>
Download mbox | patch
Permalink /patch/28644/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 1:54 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfdd783a7e515: convcmd: use our shlex wrapper to avoid Python 3 tracebacks (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2526?vs=6302&id=6318

REVISION DETAIL
  https://phab.mercurial-scm.org/D2526

AFFECTED FILES
  hgext/convert/convcmd.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -8,7 +8,6 @@ 
 
 import collections
 import os
-import shlex
 import shutil
 
 from mercurial.i18n import _
@@ -211,9 +210,7 @@ 
                     # Ignore blank lines
                     continue
                 # split line
-                lex = shlex.shlex(line, posix=True)
-                lex.whitespace_split = True
-                lex.whitespace += ','
+                lex = common.shlexer(data=line, whitespace=',')
                 line = list(lex)
                 # check number of parents
                 if not (2 <= len(line) <= 3):