diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-27 21:50:00 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-27 21:50:00 (GMT) |
| commit | 45f9af34b334b483678225a943578d2e1ea540b1 (patch) | |
| tree | 07d42daf6094f704adb5b4322891601e91176ada /Demo | |
| parent | 1c280ab7d62b4ae420964b655d99a8e4186320b3 (diff) | |
| download | cpython-45f9af34b334b483678225a943578d2e1ea540b1.zip cpython-45f9af34b334b483678225a943578d2e1ea540b1.tar.gz cpython-45f9af34b334b483678225a943578d2e1ea540b1.tar.bz2 | |
Merged revisions 59193-59201 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59195 | facundo.batista | 2007-11-27 19:50:12 +0100 (Tue, 27 Nov 2007) | 4 lines
Moved the errno import from inside the functions to the
module level. Fixes issue 1755179.
........
r59199 | christian.heimes | 2007-11-27 22:28:40 +0100 (Tue, 27 Nov 2007) | 1 line
Backport of changes to PCbuild9 from the py3k branch
........
r59200 | christian.heimes | 2007-11-27 22:34:01 +0100 (Tue, 27 Nov 2007) | 1 line
Replaced import of the 'new' module with 'types' module and added a deprecation warning to the 'new' module.
........
r59201 | christian.heimes | 2007-11-27 22:35:44 +0100 (Tue, 27 Nov 2007) | 1 line
Added a deprecation warning to the 'new' module.
........
Diffstat (limited to 'Demo')
| -rw-r--r-- | Demo/newmetaclasses/Eiffel.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Demo/newmetaclasses/Eiffel.py b/Demo/newmetaclasses/Eiffel.py index ef7f0c6..337ad93 100644 --- a/Demo/newmetaclasses/Eiffel.py +++ b/Demo/newmetaclasses/Eiffel.py @@ -1,6 +1,6 @@ """Support Eiffel-style preconditions and postconditions.""" -from new import function +from types import FunctionType as function class EiffelBaseMetaClass(type): |