##// END OF EJS Templates
Merging with upstream trunk.
Fernando Perez -
r2405:d5ed6f77 merge
parent child Browse files
Show More
@@ -292,8 +292,8 b' class CommandLineConfigLoader(ConfigLoader):'
292 292 """
293 293
294 294
295 class NoConfigDefault(object): pass
296 NoConfigDefault = NoConfigDefault()
295 class __NoConfigDefault(object): pass
296 NoConfigDefault = __NoConfigDefault()
297 297
298 298
299 299 class ArgParseConfigLoader(CommandLineConfigLoader):
@@ -31,8 +31,8 b' from IPython.utils.autoattr import auto_attr'
31 31 #-----------------------------------------------------------------------------
32 32
33 33
34 class BuiltinUndefined(object): pass
35 BuiltinUndefined = BuiltinUndefined()
34 class __BuiltinUndefined(object): pass
35 BuiltinUndefined = __BuiltinUndefined()
36 36
37 37
38 38 class BuiltinTrap(Component):
@@ -157,7 +157,7 b' def masquerade_as(instance, cls):'
157 157 cls.register_instance(instance)
158 158
159 159
160 class ComponentNameGenerator(object):
160 class __ComponentNameGenerator(object):
161 161 """A Singleton to generate unique component names."""
162 162
163 163 def __init__(self, prefix):
@@ -170,7 +170,7 b' class ComponentNameGenerator(object):'
170 170 return "%s%s" % (self.prefix, count)
171 171
172 172
173 ComponentNameGenerator = ComponentNameGenerator('ipython.component')
173 ComponentNameGenerator = __ComponentNameGenerator('ipython.component')
174 174
175 175
176 176 class MetaComponent(MetaHasTraitlets, MetaComponentTracker):
@@ -29,7 +29,29 b" if __name__ == '__main__':"
29 29 r'\.frontend',
30 30 r'\.gui'
31 31 ]
32
32 33 docwriter.module_skip_patterns += [ r'\.core\.fakemodule',
34
35 # XXX These need fixing, disabling for
36 # now but we need to figure out why
37 # they are breaking. Error from sphinx
38 # for each group copied below
39
40 # AttributeError: __abstractmethods__
41 r'\.core\.component',
42 r'\.utils\.traitlets',
43
44 # AttributeError: __provides__
45 r'\.kernel\.clusterdir',
46 r'\.kernel\.configobjfactory',
47 r'\.kernel\.fcutil',
48 r'\.kernel\.ipcontrollerapp',
49 r'\.kernel\.launcher',
50 r'\.kernel\.task',
51 r'\.kernel\.winhpcjob',
52 r'\.testing\.util',
53
54 # Keeping these disabled is OK
33 55 r'\.cocoa',
34 56 r'\.ipdoctest',
35 57 r'\.Gnuplot',
General Comments 0
You need to be logged in to leave comments. Login now