##// END OF EJS Templates
clone: remove duplicated bookmark pulling...
clone: remove duplicated bookmark pulling Now that all clone methods (copy, pull and push) also transport bookmarks, we can safely drop the manual pulling that was performed during clone.

File last commit:

r21292:a7a9d84f default
r22648:ef62c66b default
Show More
py3kcompat.py
65 lines | 2.1 KiB | text/x-python | PythonLexer
Renato Cunha
py3kcompat: added a "compatibility layer" for py3k...
r11748 # py3kcompat.py - compatibility definitions for running hg in py3k
#
# Copyright 2010 Renato Cunha <renatoc@gmail.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Matt Mackall
py3kcompat: drop unused export
r21292 import builtins
Renato Cunha
py3kcompat: added a "compatibility layer" for py3k...
r11748
from numbers import Number
def bytesformatter(format, args):
'''Custom implementation of a formatter for bytestrings.
Mads Kiilerich
fix trivial spelling errors
r17424 This function currently relies on the string formatter to do the
Renato Cunha
py3kcompat: added a "compatibility layer" for py3k...
r11748 formatting and always returns bytes objects.
>>> bytesformatter(20, 10)
0
>>> bytesformatter('unicode %s, %s!', ('string', 'foo'))
b'unicode string, foo!'
>>> bytesformatter(b'test %s', 'me')
b'test me'
>>> bytesformatter('test %s', 'me')
b'test me'
>>> bytesformatter(b'test %s', b'me')
b'test me'
>>> bytesformatter('test %s', b'me')
b'test me'
>>> bytesformatter('test %d: %s', (1, b'result'))
b'test 1: result'
'''
# The current implementation just converts from bytes to unicode, do
# what's needed and then convert the results back to bytes.
# Another alternative is to use the Python C API implementation.
if isinstance(format, Number):
# If the fixer erroneously passes a number remainder operation to
# bytesformatter, we just return the correct operation
return format % args
if isinstance(format, bytes):
format = format.decode('utf-8', 'surrogateescape')
if isinstance(args, bytes):
args = args.decode('utf-8', 'surrogateescape')
if isinstance(args, tuple):
newargs = []
for arg in args:
if isinstance(arg, bytes):
arg = arg.decode('utf-8', 'surrogateescape')
newargs.append(arg)
args = tuple(newargs)
ret = format % args
return ret.encode('utf-8', 'surrogateescape')
builtins.bytesformatter = bytesformatter
Renato Cunha
py3kcompat: added fake ord implementation for py3k...
r11878 origord = builtins.ord
def fakeord(char):
if isinstance(char, int):
return char
return origord(char)
builtins.ord = fakeord
Renato Cunha
py3kcompat: added a "compatibility layer" for py3k...
r11748 if __name__ == '__main__':
import doctest
doctest.testmod()