This is an archive of the discontinued Mercurial Phabricator instance.

symbol = b''.join(itertools.takewhile(lambda ch: ch not in special,

view[pos:]))

+ symbol = b''.join(pycompat.iterbytestr(itertools.takewhile(
+ lambda ch: ch not in special,
+ view[pos:]

It's probably better to apply iterbytestr() to view[pos:] so ch is
always a byte string.

Kwan retitled this revision from py3: use pycompat.iterbytestr to convert itertools.takewhile result back to bytes to py3: use pycompat.iterbytestr to convert memoryview slice to bytestring before passing to itertools.takewhile.Mar 14 2019, 11:40 AM

Kwan edited the summary of this revision. (Show Details)

Kwan updated this revision to Diff 14494.

In D6103#88988, @yuja wrote:
Queued most of the patches in this series, thanks.
-        symbol = b''.join(itertools.takewhile(lambda ch: ch not in special,
-                                              view[pos:]))
+        symbol = b''.join(pycompat.iterbytestr(itertools.takewhile(
+            lambda ch: ch not in special,
+            view[pos:]
It's probably better to apply iterbytestr() to view[pos:] so ch is
always a byte string.

Thanks, done!

Closed by commit rHGe7b84ffb06d9: py3: use pycompat.iterbytestr to convert memoryview slice to bytestring (authored by Kwan). · Explain WhyMar 15 2019, 10:40 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/phabricator.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14416		Mar 8 2019, 10:00 PM	★	★
Diff 2	14494		Mar 14 2019, 11:40 AM	★	★
Diff 3	14511	rHGe7b84ffb06d982f3467b4240c41adff836ab36d1	Mar 8 2019, 7:44 PM	★	★

Status	Author	Revision
Closed	Kwan	D6114 py3: add test-phabricator.py to python3-whitelist
Closed	Kwan	D6113 py3: convert to/from bytes/unicode for json.(dump\|load)s in debugcallconduit
Closed	Kwan	D6112 py3: use % instead of .format() on a bytestring
Closed	Kwan	D6111 py3: use r'' for group name arguments to MatchObjects in phabricator.py
Closed	Kwan	D6110 py3: use %d instead of %s when formatting an int into a byte string
Closed	Kwan	D6109 py3: only pass unicode to json.dumps in writediffproperties
Closed	Kwan	D6108 py3: fix a few "dict keys as str instead of bytes" issues in phabricator.py
Closed	Kwan	D6107 py3: use pycompat.byteskwargs on opts in phabricator.py
Closed	Kwan	D6106 py3: convert URL to str before passing it to request
Closed	Kwan	D6105 py3: convert indexes into bytes when enumerating lists in urlencodenested
Closed	Kwan	D6104 py3: don't try and format a bare dict into a byte string in callconduit
Closed	Kwan	D6103 py3: use pycompat.iterbytestr to convert memoryview slice to bytestring before passing to itertools.takewhile
Closed	Kwan	D6102 py3: use fsencode for the vcr recording paths and strings for the custom_patches arguments
Closed	Kwan	D6044 phabricator: convert conduit response JSON unicode to bytes inside callconduit

Diff 14511

hgext/phabricator.py


	def _tokenize(text):			def _tokenize(text):
	view = memoryview(text) # zero-copy slice			view = memoryview(text) # zero-copy slice
	special = b'():+-& '			special = b'():+-& '
	pos = 0			pos = 0
	length = len(text)			length = len(text)
	while pos < length:			while pos < length:
	symbol = b''.join(itertools.takewhile(lambda ch: ch not in special,			symbol = b''.join(itertools.takewhile(lambda ch: ch not in special,
	view[pos:]))			pycompat.iterbytestr(view[pos:])))
	if symbol:			if symbol:
	yield (b'symbol', symbol, pos)			yield (b'symbol', symbol, pos)
	pos += len(symbol)			pos += len(symbol)
	else: # special char, ignore space			else: # special char, ignore space
	if text[pos] != b' ':			if text[pos] != b' ':
	yield (text[pos], None, pos)			yield (text[pos], None, pos)
	pos += 1			pos += 1
	yield (b'end', None, pos)			yield (b'end', None, pos)

This is an archive of the discontinued Mercurial Phabricator instance.

py3: use pycompat.iterbytestr to convert memoryview slice to bytestring before passing to itertools.takewhileClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 14511

hgext/phabricator.py

py3: use pycompat.iterbytestr to convert memoryview slice to bytestring before passing to itertools.takewhile
ClosedPublic

Revision Contents
Changeset List