Merging with upstream trunk.

IPython/config/loader.py

@@ -292,8 +292,8 b' class CommandLineConfigLoader(ConfigLoader):'
     """
 
 
-class NoConfigDefault(object): pass
-NoConfigDefault = NoConfigDefault()
+class __NoConfigDefault(object): pass
+NoConfigDefault = __NoConfigDefault()
 
 
 class ArgParseConfigLoader(CommandLineConfigLoader):

IPython/core/builtin_trap.py

@@ -31,8 +31,8 b' from IPython.utils.autoattr import auto_attr'
 #-----------------------------------------------------------------------------
 
 
-class BuiltinUndefined(object): pass
-BuiltinUndefined = BuiltinUndefined()
+class __BuiltinUndefined(object): pass
+BuiltinUndefined = __BuiltinUndefined()
 
 
 class BuiltinTrap(Component):

IPython/core/component.py

@@ -157,7 +157,7 b' 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 b' class ComponentNameGenerator(object):'
         return "%s%s" % (self.prefix, count)
 
 
-ComponentNameGenerator = ComponentNameGenerator('ipython.component')
+ComponentNameGenerator = __ComponentNameGenerator('ipython.component')
 
 
 class MetaComponent(MetaHasTraitlets, MetaComponentTracker):

docs/autogen_api.py

@@ -29,7 +29,29 b" 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',