mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-18 15:51:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 77310-77311 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77310 | antoine.pitrou | 2010-01-05 01:22:44 +0200 (Tue, 05 Jan 2010) | 4 lines

  Issue #7092: Fix the DeprecationWarnings emitted by the standard library
  when using the -3 flag.  Patch by Florent Xicluna.
........
  r77311 | antoine.pitrou | 2010-01-05 01:28:16 +0200 (Tue, 05 Jan 2010) | 3 lines

  Kill a couple of "<>"
........
This commit is contained in:
Ezio Melotti 2010-08-02 00:24:26 +00:00
parent 8c7fe2d6f9
commit 8dc04a4dd1
19 changed files with 95 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/imputil.py
View file

@ -281,7 +281,8 @@ class Importer:
setattr(parent, modname, module)
return module
def _process_result(self, (ispkg, code, values), fqname):
def _process_result(self, result, fqname):
ispkg, code, values = result
# did get_code() return an actual module? (rather than a code object)
is_module = isinstance(code, _ModuleType)