This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2525

convert: add some utility code for working with shlex on Python 3
ClosedPublic

Authored by durin42 on Mar 1 2018, 6:22 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd60430dc7853: convert: add some utility code for working with shlex on Python 3
rHG52a44d7f998b: convert: add some utility code for working with shlex on Python 3
Summary

This could have gone in pycompat, but it's only needed in convert, so
I figured it made more sense here. It's got py3 in the name and checks
pycompat.ispy3, so we'll find it whenever we decide to drop Python 2
support in 20x6.

  1. no-check-commit because of required foo_bar naming on the proxy class

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/common.py (53 lines)

Diff 6317

hgext/convert/common.py

# common.py - common code for the convert extension # common.py - common code for the convert extension
# #
# Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others # Copyright 2005-2009 Matt Mackall <mpm@selenic.com> and others
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import base64 import base64
import datetime import datetime
import errno import errno
import os import os
import re import re
import shlex
import subprocess import subprocess
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
encoding, encoding,
error, error,
phases, phases,
pycompat, pycompat,
util, util,
) )
pickle = util.pickle pickle = util.pickle
propertycache = util.propertycache propertycache = util.propertycache
def _encodeornone(d):
if d is None:
return
return d.encode('latin1')
class _shlexpy3proxy(object):
def __init__(self, l):
self._l = l
def __iter__(self):
return (_encodeornone(v) for v in self._l)
def get_token(self):
return _encodeornone(self._l.get_token())
@property
def infile(self):
return self._l.infile or '<unknown>'
@property
def lineno(self):
return self._l.lineno
def shlexer(data=None, filepath=None, wordchars=None, whitespace=None):
if data is None:
if pycompat.ispy3:
data = open(filepath, 'r', encoding=r'latin1')
else:
data = open(filepath, 'r')
else:
if filepath is not None:
raise error.ProgrammingError(
'shlexer only accepts data or filepath, not both')
if pycompat.ispy3:
data = data.decode('latin1')
l = shlex.shlex(data, infile=filepath, posix=True)
if whitespace is not None:
l.whitespace_split = True
if pycompat.ispy3:
l.whitespace += whitespace.decode('latin1')
else:
l.whitespace += whitespace
if wordchars is not None:
if pycompat.ispy3:
l.wordchars += wordchars.decode('latin1')
else:
l.wordchars += wordchars
if pycompat.ispy3:
return _shlexpy3proxy(l)
return l
def encodeargs(args): def encodeargs(args):
def encodearg(s): def encodearg(s):
lines = base64.encodestring(s) lines = base64.encodestring(s)
lines = [l.splitlines()[0] for l in lines] lines = [l.splitlines()[0] for l in lines]
return ''.join(lines) return ''.join(lines)
s = pickle.dumps(args) s = pickle.dumps(args)
return encodearg(s) return encodearg(s)