# HG changeset patch # User Raphaël Gomès # Date 1565084033 -7200 # Node ID 14c12df16ab58ae9d8d9f3e05f4642fa83103260 # Parent ea8da5aa23c6e723d7f0006387a1a20eef58fc9a python3: add raw prefix to edge-cases kwargs-like objects diff -r ea8da5aa23c6 -r 14c12df16ab5 hgext3rd/evolve/legacy.py --- a/hgext3rd/evolve/legacy.py Tue Aug 06 11:32:01 2019 +0200 +++ b/hgext3rd/evolve/legacy.py Tue Aug 06 11:33:53 2019 +0200 @@ -121,10 +121,10 @@ if data: some = True for oldmark in json.loads(data): - del oldmark['id'] # dropped for now - del oldmark['reason'] # unused until then - oldobject = str(oldmark.pop('object')) - oldsubjects = [str(s) for s in oldmark.pop('subjects', [])] + del oldmark[r'id'] # dropped for now + del oldmark[r'reason'] # unused until then + oldobject = str(oldmark.pop(r'object')) + oldsubjects = [str(s) for s in oldmark.pop(r'subjects', [])] lookup_errors = (error.RepoLookupError, error.LookupError) if len(oldobject) != 40: try: @@ -137,7 +137,7 @@ except lookup_errors: pass - oldmark['date'] = '%i %i' % tuple(oldmark['date']) + oldmark[r'date'] = r'%i %i' % tuple(oldmark[r'date']) meta = dict((k.encode('utf-8'), v.encode('utf-8')) for k, v in oldmark.items()) try: diff -r ea8da5aa23c6 -r 14c12df16ab5 hgext3rd/topic/flow.py --- a/hgext3rd/topic/flow.py Tue Aug 06 11:32:01 2019 +0200 +++ b/hgext3rd/topic/flow.py Tue Aug 06 11:33:53 2019 +0200 @@ -80,8 +80,8 @@ opargs = kwargs.get('opargs') if opargs is None: opargs = {} - newargs['opargs'] = opargs.copy() - newargs['opargs']['publish'] = True + newargs[r'opargs'] = opargs.copy() + newargs[r'opargs']['publish'] = True return orig(repo, remote, *args, **newargs) def extendpushoperation(orig, self, *args, **kwargs):