comparison hgext/win32mbcs.py @ 9131:2bbb8419720d

win32mbcs: wrapper supports keyword arguments and dict result.

The keyword arguments are also decoded before calling original.
And dict of return value is also encoded back.

9130:335f749cc369

        raise UnicodeError("Not local encoding")
    elif isinstance(arg, tuple):
        return tuple(map(decode, arg))
    elif isinstance(arg, list):
        return map(decode, arg)
    return arg

def encode(arg):
    if isinstance(arg, unicode):
        return arg.encode(encoding.encoding)
    elif isinstance(arg, tuple):
        return tuple(map(encode, arg))
    elif isinstance(arg, list):
        return map(encode, arg)
    return arg

def wrapper(func, args):
    # check argument is unicode, then call original
    for arg in args:
        if isinstance(arg, unicode):
            return func(*args)

    try:
        # convert arguments to unicode, call func, then convert back
        return encode(func(*decode(args)))
    except UnicodeError:
        # If not encoded with encoding.encoding, report it then
        # continue with calling original function.
        raise util.Abort(_("[win32mbcs] filename conversion fail with"
                         " %s encoding\n") % (encoding.encoding))

def wrapname(name):
    module, name = name.rsplit('.', 1)
    module = sys.modules[module]
    func = getattr(module, name)
    def f(*args):
        return wrapper(func, args)
    try:
        f.__name__ = func.__name__                # fail with python23
    except Exception:
        pass
    setattr(module, name, f)

9131:2bbb8419720d

        raise UnicodeError("Not local encoding")
    elif isinstance(arg, tuple):
        return tuple(map(decode, arg))
    elif isinstance(arg, list):
        return map(decode, arg)
    elif isinstance(arg, dict):
        for k, v in arg.items():
            arg[k] = decode(v)
    return arg

def encode(arg):
    if isinstance(arg, unicode):
        return arg.encode(encoding.encoding)
    elif isinstance(arg, tuple):
        return tuple(map(encode, arg))
    elif isinstance(arg, list):
        return map(encode, arg)
    elif isinstance(arg, dict):
        for k, v in arg.items():
            arg[k] = encode(v)
    return arg

def wrapper(func, args, kwds):
    # check argument is unicode, then call original
    for arg in args:
        if isinstance(arg, unicode):
            return func(*args, **kwds)

    try:
        # convert arguments to unicode, call func, then convert back
        return encode(func(*decode(args), **decode(kwds)))
    except UnicodeError:
        # If not encoded with encoding.encoding, report it then
        # continue with calling original function.
        raise util.Abort(_("[win32mbcs] filename conversion fail with"
                         " %s encoding\n") % (encoding.encoding))

def wrapname(name):
    module, name = name.rsplit('.', 1)
    module = sys.modules[module]
    func = getattr(module, name)
    def f(*args, **kwds):
        return wrapper(func, args, kwds)
    try:
        f.__name__ = func.__name__                # fail with python23
    except Exception:
        pass
    setattr(module, name, f)