114 for i in modules[module].imports: |
114 for i in modules[module].imports: |
115 if i in modules: |
115 if i in modules: |
116 impLst.append(i) |
116 impLst.append(i) |
117 else: |
117 else: |
118 if i.find('.') == -1: |
118 if i.find('.') == -1: |
119 n = "%s.%s" % (modules[module].package, i) |
119 n = "{0}.{1}".format(modules[module].package, i) |
120 if n in modules: |
120 if n in modules: |
121 impLst.append(n) |
121 impLst.append(n) |
122 else: |
122 else: |
123 n = "%s.%s" % (project, i) |
123 n = "{0}.{1}".format(project, i) |
124 if n in modules: |
124 if n in modules: |
125 impLst.append(n) |
125 impLst.append(n) |
126 elif n in packages: |
126 elif n in packages: |
127 n = "%s.<<Dummy>>" % n |
127 n = "{0}.<<Dummy>>".format(n) |
128 impLst.append(n) |
128 impLst.append(n) |
129 else: |
129 else: |
130 n = "%s.%s" % (project, i) |
130 n = "{0}.{1}".format(project, i) |
131 if n in modules: |
131 if n in modules: |
132 impLst.append(n) |
132 impLst.append(n) |
133 for i in list(modules[module].from_imports.keys()): |
133 for i in list(modules[module].from_imports.keys()): |
134 if i.startswith('.'): |
134 if i.startswith('.'): |
135 dots = len(i) - len(i.lstrip('.')) |
135 dots = len(i) - len(i.lstrip('.')) |
151 |
151 |
152 if i in modules: |
152 if i in modules: |
153 impLst.append(i) |
153 impLst.append(i) |
154 else: |
154 else: |
155 if i.find('.') == -1: |
155 if i.find('.') == -1: |
156 n = "%s.%s" % (modules[module].package, i) |
156 n = "{0}.{1}".format(modules[module].package, i) |
157 if n in modules: |
157 if n in modules: |
158 impLst.append(n) |
158 impLst.append(n) |
159 else: |
159 else: |
160 n = "%s.%s" % (project, i) |
160 n = "{0}.{1}".format(project, i) |
161 if n in modules: |
161 if n in modules: |
162 impLst.append(n) |
162 impLst.append(n) |
163 elif n in packages: |
163 elif n in packages: |
164 n = "%s.<<Dummy>>" % n |
164 n = "{0}.<<Dummy>>".format(n) |
165 impLst.append(n) |
165 impLst.append(n) |
166 else: |
166 else: |
167 n = "%s.%s" % (project, i) |
167 n = "{0}.{1}".format(project, i) |
168 if n in modules: |
168 if n in modules: |
169 impLst.append(n) |
169 impLst.append(n) |
170 for imp in impLst: |
170 for imp in impLst: |
171 impPackage = '.'.join(imp.split('.')[:-1]) |
171 impPackage = '.'.join(imp.split('.')[:-1]) |
172 if not impPackage in packages[package][1] and \ |
172 if not impPackage in packages[package][1] and \ |