comparison contrib/hgfixes/fix_bytes.py @ 11748:37a70a784397

py3kcompat: added a "compatibility layer" for py3k This patch adds some ugly constructs. The first of them is bytesformatter, a function that formats strings like when '%' is called. The main motivation for this function is py3k's strange behavior: >>> 'foo %s' % b'bar' "foo b'bar'" >>> b'foo %s' % b'bar' Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: unsupported operand type(s) for %: 'bytes' and 'bytes' >>> b'foo %s' % 'bar' Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: unsupported operand type(s) for %: 'bytes' and 'str' In other words, if we can't format bytes with bytes, and recall that all mercurial strings will be converted by a fixer, then things will break badly if we don't take a similar approach. The other addition with this patch is that the os.environ dictionary is monkeypatched to have bytes items. Hopefully this won't be needed in the future, as python 3.2 might get a os.environb dictionary that holds bytes items.
author Renato Cunha <renatoc@gmail.com>
date Tue, 03 Aug 2010 13:52:48 -0300
parents 40d5633889bb
children e51d4aedace9
comparison
equal deleted inserted replaced
11747:40d5633889bb 11748:37a70a784397
11 11
12 # XXX: Implementing a blacklist in 2to3 turned out to be more troublesome than 12 # XXX: Implementing a blacklist in 2to3 turned out to be more troublesome than
13 # blacklisting some modules inside the fixers. So, this is what I came with. 13 # blacklisting some modules inside the fixers. So, this is what I came with.
14 14
15 blacklist = ['mercurial/demandimport.py', 15 blacklist = ['mercurial/demandimport.py',
16 'mercurial/py3kcompat.py', # valid python 3 already
16 'mercurial/i18n.py', 17 'mercurial/i18n.py',
17 ] 18 ]
18 19
19 def isdocstring(node): 20 def isdocstring(node):
20 def isclassorfunction(ancestor): 21 def isclassorfunction(ancestor):