[PATCH v2] store: treat range as a generator instead of a list for py3 compat
timeless
timeless at fmr.im
Fri Apr 15 21:22:13 UTC 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1460273306 0
# Sun Apr 10 07:28:26 2016 +0000
# Node ID 573e82339367c562d1ae0f8ed2b1ad611be8a77e
# Parent d9539959167df7cb3acd08c4ab53d8e8a7f027cb
# Available At bb://timeless/mercurial-crew
# hg pull bb://timeless/mercurial-crew -r 573e82339367
store: treat range as a generator instead of a list for py3 compat
diff -r d9539959167d -r 573e82339367 mercurial/store.py
--- a/mercurial/store.py Fri Apr 15 20:37:11 2016 +0900
+++ b/mercurial/store.py Sun Apr 10 07:28:26 2016 +0000
@@ -57,6 +57,23 @@
.replace(".i.hg/", ".i/")
.replace(".hg.hg/", ".hg/"))
+def _reserved():
+ ''' characters that are problematic for filesystems
+
+ * ascii escapes (0..31)
+ * ascii hi (126..255)
+ * windows specials
+
+ these characters will be escaped by encodefunctions
+ '''
+ winreserved = [ord(x) for x in '\\:*?"<>|']
+ for x in range(32):
+ yield x
+ for x in range(126, 256):
+ yield x
+ for x in winreserved:
+ yield x
+
def _buildencodefun():
'''
>>> enc, dec = _buildencodefun()
@@ -82,11 +99,10 @@
'the\\x07quick\\xadshot'
'''
e = '_'
- winreserved = [ord(x) for x in '\\:*?"<>|']
cmap = dict([(chr(x), chr(x)) for x in xrange(127)])
- for x in (range(32) + range(126, 256) + winreserved):
+ for x in _reserved():
cmap[chr(x)] = "~%02x" % x
- for x in range(ord("A"), ord("Z") + 1) + [ord(e)]:
+ for x in list(range(ord("A"), ord("Z") + 1)) + [ord(e)]:
cmap[chr(x)] = e + chr(x).lower()
dmap = {}
for k, v in cmap.iteritems():
@@ -134,9 +150,8 @@
>>> f('the\x07quick\xADshot')
'the~07quick~adshot'
'''
- winreserved = [ord(x) for x in '\\:*?"<>|']
cmap = dict([(chr(x), chr(x)) for x in xrange(127)])
- for x in (range(32) + range(126, 256) + winreserved):
+ for x in _reserved():
cmap[chr(x)] = "~%02x" % x
for x in range(ord("A"), ord("Z") + 1):
cmap[chr(x)] = chr(x).lower()
More information about the Mercurial-devel
mailing list