mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-31 22:47:28 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
31 lines
895 B
Diff
31 lines
895 B
Diff
# Fix test errors with python 3.4 - thanks to Ubuntu developer Barry Warsaw.
|
|
|
|
diff -r d356250e275d mock.py
|
|
--- a/mock.py Tue Apr 09 14:53:33 2013 +0100
|
|
+++ b/mock.py Wed Feb 26 15:12:18 2014 -0500
|
|
@@ -239,12 +239,21 @@
|
|
funcopy.__name__ = func.__name__
|
|
funcopy.__doc__ = func.__doc__
|
|
#funcopy.__dict__.update(func.__dict__)
|
|
- funcopy.__module__ = func.__module__
|
|
+ try:
|
|
+ funcopy.__module__ = func.__module__
|
|
+ except AttributeError:
|
|
+ pass
|
|
if not inPy3k:
|
|
funcopy.func_defaults = func.func_defaults
|
|
return
|
|
- funcopy.__defaults__ = func.__defaults__
|
|
- funcopy.__kwdefaults__ = func.__kwdefaults__
|
|
+ try:
|
|
+ funcopy.__defaults__ = func.__defaults__
|
|
+ except AttributeError:
|
|
+ pass
|
|
+ try:
|
|
+ funcopy.__kwdefaults__ = func.__kwdefaults__
|
|
+ except AttributeError:
|
|
+ pass
|
|
|
|
|
|
def _callable(obj):
|