From d5ed6f777ab49806d9f00f99036c9b83379f28bf 2010-01-08 22:33:12 From: Fernando Perez Date: 2010-01-08 22:33:12 Subject: [PATCH] Merging with upstream trunk. --- diff --git a/IPython/config/loader.py b/IPython/config/loader.py index 328cd76..7fb3f3e 100644 --- a/IPython/config/loader.py +++ b/IPython/config/loader.py @@ -292,8 +292,8 @@ class CommandLineConfigLoader(ConfigLoader): """ -class NoConfigDefault(object): pass -NoConfigDefault = NoConfigDefault() +class __NoConfigDefault(object): pass +NoConfigDefault = __NoConfigDefault() class ArgParseConfigLoader(CommandLineConfigLoader): diff --git a/IPython/core/builtin_trap.py b/IPython/core/builtin_trap.py index 8ddbcf7..8021c5a 100755 --- a/IPython/core/builtin_trap.py +++ b/IPython/core/builtin_trap.py @@ -31,8 +31,8 @@ from IPython.utils.autoattr import auto_attr #----------------------------------------------------------------------------- -class BuiltinUndefined(object): pass -BuiltinUndefined = BuiltinUndefined() +class __BuiltinUndefined(object): pass +BuiltinUndefined = __BuiltinUndefined() class BuiltinTrap(Component): diff --git a/IPython/core/component.py b/IPython/core/component.py index a928b40..42c6118 100644 --- a/IPython/core/component.py +++ b/IPython/core/component.py @@ -157,7 +157,7 @@ def masquerade_as(instance, cls): cls.register_instance(instance) -class ComponentNameGenerator(object): +class __ComponentNameGenerator(object): """A Singleton to generate unique component names.""" def __init__(self, prefix): @@ -170,7 +170,7 @@ class ComponentNameGenerator(object): return "%s%s" % (self.prefix, count) -ComponentNameGenerator = ComponentNameGenerator('ipython.component') +ComponentNameGenerator = __ComponentNameGenerator('ipython.component') class MetaComponent(MetaHasTraitlets, MetaComponentTracker): diff --git a/docs/autogen_api.py b/docs/autogen_api.py index 3a40acc..0efc8b6 100755 --- a/docs/autogen_api.py +++ b/docs/autogen_api.py @@ -29,7 +29,29 @@ if __name__ == '__main__': r'\.frontend', r'\.gui' ] + docwriter.module_skip_patterns += [ r'\.core\.fakemodule', + + # XXX These need fixing, disabling for + # now but we need to figure out why + # they are breaking. Error from sphinx + # for each group copied below + + # AttributeError: __abstractmethods__ + r'\.core\.component', + r'\.utils\.traitlets', + + # AttributeError: __provides__ + r'\.kernel\.clusterdir', + r'\.kernel\.configobjfactory', + r'\.kernel\.fcutil', + r'\.kernel\.ipcontrollerapp', + r'\.kernel\.launcher', + r'\.kernel\.task', + r'\.kernel\.winhpcjob', + r'\.testing\.util', + + # Keeping these disabled is OK r'\.cocoa', r'\.ipdoctest', r'\.Gnuplot',