Show More
@@ -4,6 +4,7 b'' | |||
|
4 | 4 | Authors |
|
5 | 5 | ------- |
|
6 | 6 | - Jörgen Stenarson <jorgen.stenarson@bostream.nu> |
|
7 | - Thomas Kluyver | |
|
7 | 8 | """ |
|
8 | 9 | |
|
9 | 10 | #***************************************************************************** |
@@ -19,7 +20,7 b' import types' | |||
|
19 | 20 | from IPython.utils.dir2 import dir2 |
|
20 | 21 | |
|
21 | 22 | def create_typestr2type_dicts(dont_include_in_type2typestr=["lambda"]): |
|
22 | """Return dictionaries mapping lower case typename (e.g. 'tuple) to type | |
|
23 | """Return dictionaries mapping lower case typename (e.g. 'tuple') to type | |
|
23 | 24 | objects from the types package, and vice versa.""" |
|
24 | 25 | typenamelist = [tname for tname in dir(types) if tname.endswith("Type")] |
|
25 | 26 | typestr2type, type2typestr = {}, {} |
@@ -54,17 +55,11 b' def show_hidden(str,show_all=False):' | |||
|
54 | 55 | """Return true for strings starting with single _ if show_all is true.""" |
|
55 | 56 | return show_all or str.startswith("__") or not str.startswith("_") |
|
56 | 57 | |
|
57 | class NameSpace(dict): | |
|
58 | """NameSpace holds the dictionary for a namespace and implements filtering | |
|
59 | on name and types""" | |
|
60 | ||
|
61 | @classmethod | |
|
62 | def from_object(cls, obj, *args, **kwargs): | |
|
63 | """Instantiate a namespace by constructing a dictionary of an object's | |
|
64 | attributes. A class method, returns a new NameSpace instance.""" | |
|
65 | ns = cls() | |
|
58 | def dict_dir(obj): | |
|
59 | """Produce a dictionary of an object's attributes. Builds on dir2 by | |
|
60 | checking that a getattr() call actually succeeds.""" | |
|
61 | ns = {} | |
|
66 | 62 |
|
|
67 | if isinstance(key, basestring): | |
|
68 | 63 |
|
|
69 | 64 |
|
|
70 | 65 |
|
@@ -77,10 +72,9 b' class NameSpace(dict):' | |||
|
77 | 72 |
|
|
78 | 73 |
|
|
79 | 74 | |
|
80 |
|
|
|
75 | def filter_ns(ns, name_pattern="*", type_pattern="all", ignore_case=True, | |
|
81 | 76 |
|
|
82 | """Return a dictionary of the namespace filtered by regex pattern and | |
|
83 | item type.""" | |
|
77 | """Filter a namespace dictionary by name pattern and item type.""" | |
|
84 | 78 |
|
|
85 | 79 |
|
|
86 | 80 |
|
@@ -88,7 +82,7 b' class NameSpace(dict):' | |||
|
88 | 82 |
|
|
89 | 83 |
|
|
90 | 84 |
|
|
91 |
|
|
|
85 | return dict((key,obj) for key, obj in ns.iteritems() if reg.match(key) \ | |
|
92 | 86 |
|
|
93 | 87 |
|
|
94 | 88 | |
@@ -96,30 +90,22 b' def list_namespace(namespace, type_pattern, filter, ignore_case=False, show_all=' | |||
|
96 | 90 | """Return dictionary of all objects in a namespace dictionary that match |
|
97 | 91 | type_pattern and filter.""" |
|
98 | 92 | pattern_list=filter.split(".") |
|
99 | ns = NameSpace(namespace) | |
|
100 | return _list_namespace(ns, type_pattern, pattern_list, ignore_case,show_all) | |
|
101 | # This function is a more convenient wrapper around the recursive one below. | |
|
102 | ||
|
103 | def _list_namespace(ns, type_pattern, pattern_list, ignore_case=False, show_all=False): | |
|
104 | """Return dictionary of objects in a namespace which match type_pattern | |
|
105 | and filter (pattern_list). | |
|
106 | ||
|
107 | This is a recursive function behind list_namespace, which is intended to be | |
|
108 | the public interface. Unlike that function, this expects a NameSpace | |
|
109 | instance as the first argument, and the name pattern split by '.'s.""" | |
|
110 | 93 | if len(pattern_list) == 1: |
|
111 |
return |
|
|
94 | return filter_ns(namespace, name_pattern=pattern_list[0], | |
|
95 | type_pattern=type_pattern, | |
|
112 | 96 |
|
|
113 | 97 | else: |
|
114 | 98 | # This is where we can change if all objects should be searched or |
|
115 | 99 | # only modules. Just change the type_pattern to module to search only |
|
116 | 100 | # modules |
|
117 |
filtered = |
|
|
101 | filtered = filter_ns(namespace, name_pattern=pattern_list[0], | |
|
102 | type_pattern="all", | |
|
118 | 103 | ignore_case=ignore_case, show_all=show_all) |
|
119 | 104 | results = {} |
|
120 | 105 | for name, obj in filtered.iteritems(): |
|
121 |
ns = |
|
|
122 | pattern_list[1:], ignore_case=ignore_case, show_all=show_all) | |
|
106 | ns = list_namespace(dict_dir(obj), type_pattern, | |
|
107 | ".".join(pattern_list[1:]), | |
|
108 | ignore_case=ignore_case, show_all=show_all) | |
|
123 | 109 | for inner_name,inner_obj in ns.iteritems(): |
|
124 | 110 | results["%s.%s"%(name,inner_name)] = inner_obj |
|
125 | 111 | return results |
General Comments 0
You need to be logged in to leave comments.
Login now