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

Add some whitespace to be more consistent.

Browse source
This commit is contained in:
Neal Norwitz 2006-04-28 04:32:20 +00:00
parent 076ba2129b
commit 0bbbb005c5
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Lib/pkgutil.py
View file

@ -31,7 +31,7 @@ def read_code(stream):
def simplegeneric(func): def simplegeneric(func):
"""Make a trivial single-dispatch generic function""" """Make a trivial single-dispatch generic function"""
registry = {} registry = {}
def wrapper(*args,**kw): def wrapper(*args, **kw):
ob = args[0] ob = args[0]
try: try:
cls = ob.__class__ cls = ob.__class__
@ -41,18 +41,19 @@ def simplegeneric(func):
mro = cls.__mro__ mro = cls.__mro__
except AttributeError: except AttributeError:
try: try:
class cls(cls,object): pass class cls(cls, object):
pass
mro = cls.__mro__[1:] mro = cls.__mro__[1:]
except TypeError: except TypeError:
mro = object, # must be an ExtensionClass or some such :( mro = object, # must be an ExtensionClass or some such :(
for t in mro: for t in mro:
if t in registry: if t in registry:
return registry[t](*args,**kw) return registry[t](*args, **kw)
else: else:
return func(*args,**kw) return func(*args, **kw)
try: try:
wrapper.__name__ = func.__name__ wrapper.__name__ = func.__name__
except (TypeError,AttributeError): except (TypeError, AttributeError):
pass # Python 2.3 doesn't allow functions to be renamed pass # Python 2.3 doesn't allow functions to be renamed
def register(typ, func=None): def register(typ, func=None):
@ -70,8 +71,9 @@ def simplegeneric(func):
def walk_packages(path=None, prefix='', onerror=None): def walk_packages(path=None, prefix='', onerror=None):
"""Yield submodule names+loaders recursively, for path or sys.path""" """Yield submodule names+loaders recursively, for path or sys.path"""
def seen(p,m={}): def seen(p, m={}):
if p in m: return True if p in m:
return True
m[p] = True m[p] = True
for importer, name, ispkg in iter_modules(path, prefix): for importer, name, ispkg in iter_modules(path, prefix):
@ -110,7 +112,7 @@ def iter_modules(path=None, prefix=''):
#@simplegeneric #@simplegeneric
def iter_importer_modules(importer, prefix=''): def iter_importer_modules(importer, prefix=''):
if not hasattr(importer,'iter_modules'): if not hasattr(importer, 'iter_modules'):
return [] return []
return importer.iter_modules(prefix) return importer.iter_modules(prefix)
@ -336,7 +338,7 @@ def get_importer(path_item):
pass pass
else: else:
importer = None importer = None
sys.path_importer_cache.setdefault(path_item,importer) sys.path_importer_cache.setdefault(path_item, importer)
if importer is None: if importer is None:
try: try:
@ -377,7 +379,7 @@ def iter_importers(fullname=""):
pkg = '.'.join(fullname.split('.')[:-1]) pkg = '.'.join(fullname.split('.')[:-1])
if pkg not in sys.modules: if pkg not in sys.modules:
__import__(pkg) __import__(pkg)
path = getattr(sys.modules[pkg],'__path__',None) or [] path = getattr(sys.modules[pkg], '__path__', None) or []
else: else:
for importer in sys.meta_path: for importer in sys.meta_path:
yield importer yield importer
@ -404,7 +406,7 @@ def get_loader(module_or_name):
module_or_name = sys.modules[module_or_name] module_or_name = sys.modules[module_or_name]
if isinstance(module_or_name, ModuleType): if isinstance(module_or_name, ModuleType):
module = module_or_name module = module_or_name
loader = getattr(module,'__loader__',None) loader = getattr(module, '__loader__', None)
if loader is not None: if loader is not None:
return loader return loader
fullname = module.__name__ fullname = module.__name__