[PATCH 8 of 8 v2] python3: handle __code__/func_code divergence
timeless
timeless at mozdev.org
Wed Mar 30 00:33:23 EDT 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1459273403 0
# Tue Mar 29 17:43:23 2016 +0000
# Node ID 4986c2a190dd3dfe38c40ddb121acef479c6cb78
# Parent 7049e93dc5766ba35e91fd15755f4c5a899bfcc0
python3: handle __code__/func_code divergence
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -451,10 +451,18 @@
"%b %Y",
)
+try:
+ version.func_code
+ def funccode(func):
+ return func.func_code
+except AttributeError:
+ def funccode(func):
+ return func.__code__
+
def cachefunc(func):
'''cache the result of function calls'''
# XXX doesn't handle keywords args
- if func.func_code.co_argcount == 0:
+ if funccode(func).co_argcount == 0:
cache = []
def f():
if len(cache) == 0:
@@ -462,7 +470,7 @@
return cache[0]
return f
cache = {}
- if func.func_code.co_argcount == 1:
+ if funccode(func).co_argcount == 1:
# we gain a small amount of time because
# we don't need to pack/unpack the list
def f(arg):
@@ -704,7 +712,7 @@
'''cache most recent results of function calls'''
cache = {}
order = collections.deque()
- if func.func_code.co_argcount == 1:
+ if funccode(func).co_argcount == 1:
def f(arg):
if arg not in cache:
if len(cache) > 20:
diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t
+++ b/tests/test-check-py3-compat.t
@@ -124,13 +124,13 @@
contrib/import-checker.py: invalid syntax: Missing parentheses in call to 'print' (<unknown>, line *) (glob)
doc/hgmanpage.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
hgext/automv.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)
- hgext/blackbox.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/blackbox.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/bugzilla.py: error importing module: <ImportError> No module named 'urlparse' (line *) (glob)
- hgext/censor.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/censor.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/chgserver.py: error importing module: <ImportError> No module named 'SocketServer' (line *) (glob)
- hgext/children.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/churn.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/clonebundles.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/children.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/churn.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/clonebundles.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/color.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
hgext/convert/bzr.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob)
hgext/convert/common.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob)
@@ -141,69 +141,69 @@
hgext/convert/filemap.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob)
hgext/convert/git.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob)
hgext/convert/gnuarch.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob)
- hgext/convert/hg.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/convert/hg.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/convert/monotone.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob)
hgext/convert/p*.py: error importing module: <SystemError> Parent module 'hgext.convert' not loaded, cannot perform relative import (line *) (glob)
hgext/convert/subversion.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob)
hgext/convert/transport.py: error importing module: <ImportError> No module named 'svn.client' (line *) (glob)
- hgext/eol.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/extdiff.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/eol.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/extdiff.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/factotum.py: error importing: <ImportError> No module named 'httplib' (error at url.py:*) (glob)
hgext/fetch.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)
hgext/fsmonitor/watchmanclient.py: error importing module: <SystemError> Parent module 'hgext.fsmonitor' not loaded, cannot perform relative import (line *) (glob)
hgext/gpg.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)
- hgext/graphlog.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/hgcia.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/hgk.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/graphlog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/hgcia.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/hgk.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/highlight/highlight.py: error importing module: <ImportError> No module named 'pygments' (line *) (glob)
hgext/histedit.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
hgext/keyword.py: error importing: <ImportError> No module named 'BaseHTTPServer' (error at common.py:*) (glob)
hgext/largefiles/basestore.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob)
hgext/largefiles/lfcommands.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob)
- hgext/largefiles/lfutil.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/largefiles/lfutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/largefiles/localstore.py: error importing module: <ImportError> No module named 'lfutil' (line *) (glob)
hgext/largefiles/overrides.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob)
hgext/largefiles/proto.py: error importing: <ImportError> No module named 'httplib' (error at httppeer.py:*) (glob)
hgext/largefiles/remotestore.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at wireproto.py:*) (glob)
- hgext/largefiles/reposetup.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/largefiles/reposetup.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/largefiles/uisetup.py: error importing module: <SyntaxError> invalid syntax (archival.py, line *) (line *) (glob)
hgext/largefiles/wirestore.py: error importing module: <ImportError> No module named 'lfutil' (line *) (glob)
hgext/mq.py: error importing module: <SyntaxError> invalid syntax (commands.py, line *) (line *) (glob)
- hgext/notify.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/pager.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/patchbomb.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/purge.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/notify.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/pager.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/patchbomb.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/purge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/rebase.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob)
- hgext/record.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/relink.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/schemes.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- hgext/share.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/record.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/relink.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/schemes.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ hgext/share.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/shelve.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
- hgext/strip.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ hgext/strip.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
hgext/transplant.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob)
mercurial/archival.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
- mercurial/branchmap.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/branchmap.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/bundle*.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
mercurial/bundlerepo.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
- mercurial/changegroup.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/changelog.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/cmdutil.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/changegroup.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/changelog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/cmdutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/commands.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
mercurial/commandserver.py: error importing module: <ImportError> No module named 'SocketServer' (line *) (glob)
- mercurial/context.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/copies.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/crecord.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/dirstate.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/discovery.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/dispatch.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/context.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/copies.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/crecord.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/dirstate.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/discovery.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/dispatch.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/exchange.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
- mercurial/extensions.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/filelog.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/filemerge.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/fileset.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/extensions.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/filelog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/filemerge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/fileset.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/formatter.py: error importing module: <ImportError> No module named 'cPickle' (line *) (glob)
- mercurial/graphmod.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/help.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/graphmod.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/help.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/hg.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at bundlerepo.py:*) (glob)
mercurial/hgweb/common.py: error importing module: <ImportError> No module named 'BaseHTTPServer' (line *) (glob)
mercurial/hgweb/hgweb_mod.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
@@ -214,37 +214,37 @@
mercurial/hgweb/webcommands.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
mercurial/hgweb/webutil.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
mercurial/hgweb/wsgicgi.py: error importing module: <SystemError> Parent module 'mercurial.hgweb' not loaded, cannot perform relative import (line *) (glob)
- mercurial/hook.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/hook.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/httpclient/_readers.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob)
mercurial/httpconnection.py: error importing: <ImportError> No module named 'httplib' (error at __init__.py:*) (glob)
mercurial/httppeer.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob)
mercurial/keepalive.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob)
- mercurial/localrepo.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/localrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/mail.py: error importing module: <AttributeError> module 'email' has no attribute 'Header' (line *) (glob)
- mercurial/manifest.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/merge.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/namespaces.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/patch.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/manifest.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/merge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/namespaces.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/patch.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/pure/parsers.py: error importing module: <ImportError> No module named 'mercurial.pure.node' (line *) (glob)
mercurial/repair.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
- mercurial/revlog.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/revset.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/scmutil.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/revlog.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/revset.py: error importing module: <AttributeError> 'dict' object has no attribute 'iteritems' (line *) (glob)
+ mercurial/scmutil.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/scmwindows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob)
- mercurial/simplemerge.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/simplemerge.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/sshpeer.py: error importing: <SyntaxError> invalid syntax (bundle*.py, line *) (error at wireproto.py:*) (glob)
- mercurial/sshserver.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/statichttprepo.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/store.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/streamclone.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/subrepo.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/templatefilters.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/templatekw.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
- mercurial/templater.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/sshserver.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/statichttprepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/store.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/streamclone.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/subrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/templatefilters.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/templatekw.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
+ mercurial/templater.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/ui.py: error importing: <ImportError> No module named 'cPickle' (error at formatter.py:*) (glob)
- mercurial/unionrepo.py: error importing: <AttributeError> 'function' object has no attribute 'func_code' (error at util.py:*) (glob)
+ mercurial/unionrepo.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/url.py: error importing module: <ImportError> No module named 'httplib' (line *) (glob)
- mercurial/verify.py: error importing module: <AttributeError> 'function' object has no attribute 'func_code' (line *) (glob)
+ mercurial/verify.py: error importing: <AttributeError> 'dict' object has no attribute 'iteritems' (error at revset.py:*) (glob)
mercurial/win*.py: error importing module: <ImportError> No module named 'msvcrt' (line *) (glob)
mercurial/windows.py: error importing module: <ImportError> No module named '_winreg' (line *) (glob)
mercurial/wireproto.py: error importing module: <SyntaxError> invalid syntax (bundle*.py, line *) (line *) (glob)
More information about the Mercurial-devel
mailing list