Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r89995:7cab0b276e26
Date: 2017-02-07 10:42 +0100
http://bitbucket.org/pypy/pypy/changeset/7cab0b276e26/
Log: hg merge default
diff --git a/pypy/objspace/std/dictmultiobject.py
b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -283,21 +283,15 @@
w_value = self.getitem(w_key)
return w_value if w_value is not None else w_default
- @unwrap_spec(defaults_w='args_w')
- def descr_pop(self, space, w_key, defaults_w):
+ def descr_pop(self, space, w_key, w_default=None):
"""D.pop(k[,d]) -> v, remove specified key and return the
corresponding value\nIf key is not found, d is returned if given,
otherwise KeyError is raised
"""
- len_defaults = len(defaults_w)
- if len_defaults > 1:
- raise oefmt(space.w_TypeError,
- "pop expected at most 2 arguments, got %d",
- 1 + len_defaults)
w_item = self.getitem(w_key)
if w_item is None:
- if len_defaults > 0:
- return defaults_w[0]
+ if w_default is not None:
+ return w_default
else:
space.raise_key_error(w_key)
else:
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -179,7 +179,7 @@
shutil.copytree(str(basedir.join('lib_pypy')),
str(pypydir.join('lib_pypy')),
ignore=ignore_patterns('.svn', 'py', '*.pyc', '*~',
- '*.c', '*.o'))
+ '*_cffi.c', '*.o'))
for file in ['README.rst',]:
shutil.copy(str(basedir.join(file)), str(pypydir))
for file in ['_testcapimodule.c', '_ctypes_test.c']:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
