##// END OF EJS Templates
Disable typecheck for namespaces to be dicts....
Fernando Perez -
Show More
@@ -108,13 +108,6 b' class Completer:'
108 readline.set_completer(Completer(my_namespace).complete)
108 readline.set_completer(Completer(my_namespace).complete)
109 """
109 """
110
110
111 # some minimal strict typechecks. For some core data structures, I
112 # want actual basic python types, not just anything that looks like
113 # one. This is especially true for namespaces.
114 for ns in (namespace,global_namespace):
115 if ns is not None and type(ns) != types.DictType:
116 raise TypeError,'namespace must be a dictionary'
117
118 # Don't bind to namespace quite yet, but flag whether the user wants a
111 # Don't bind to namespace quite yet, but flag whether the user wants a
119 # specific namespace or to use __main__.__dict__. This will allow us
112 # specific namespace or to use __main__.__dict__. This will allow us
120 # to bind to __main__.__dict__ at completion time, not now.
113 # to bind to __main__.__dict__ at completion time, not now.
@@ -212,13 +212,7 b' class InteractiveShell(object,Magic):'
212
212
213 # log system
213 # log system
214 self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate')
214 self.logger = Logger(self,logfname='ipython_log.py',logmode='rotate')
215
215
216 # some minimal strict typechecks. For some core data structures, I
217 # want actual basic python types, not just anything that looks like
218 # one. This is especially true for namespaces.
219 for ns in (user_ns,user_global_ns):
220 if ns is not None and type(ns) != types.DictType:
221 raise TypeError,'namespace must be a dictionary'
222 # Job manager (for jobs run as background threads)
216 # Job manager (for jobs run as background threads)
223 self.jobs = BackgroundJobManager()
217 self.jobs = BackgroundJobManager()
224
218
@@ -1033,7 +1027,7 b' class InteractiveShell(object,Magic):'
1033 state += 1
1027 state += 1
1034 outcomps = comps.keys()
1028 outcomps = comps.keys()
1035 outcomps.sort()
1029 outcomps.sort()
1036 print "T:",text,"OC:",outcomps # dbg
1030 #print "T:",text,"OC:",outcomps # dbg
1037 #print "vars:",self.user_ns.keys()
1031 #print "vars:",self.user_ns.keys()
1038 return outcomps
1032 return outcomps
1039
1033
@@ -2382,7 +2376,6 b' want to merge them back into the new files.""" % locals()'
2382
2376
2383 # This should only be active for single-line input!
2377 # This should only be active for single-line input!
2384 if continue_prompt:
2378 if continue_prompt:
2385 print 'getting out!' # dbg
2386 self.log(line,line,continue_prompt)
2379 self.log(line,line,continue_prompt)
2387 return line
2380 return line
2388
2381
General Comments 0
You need to be logged in to leave comments. Login now