Mercurial Repositories > eric / file comparison
comparison: eric6/Utilities/ClassBrowsers/__init__.py
eric6/Utilities/ClassBrowsers/__init__.py
- changeset 7637
- c878e8255972
- parent 7400
- e5d62581d002
- child 7639
- 422fd05e9c91
equal
deleted
inserted
replaced
| 7636:61566f35ab22 | 7637:c878e8255972 |
|---|---|
| 79 elif ext in __extensions["JavaScript"]: | 79 elif ext in __extensions["JavaScript"]: |
| 80 from . import jsclbr | 80 from . import jsclbr |
| 81 dictionary = jsclbr.readmodule_ex(module, path) | 81 dictionary = jsclbr.readmodule_ex(module, path) |
| 82 jsclbr._modules.clear() | 82 jsclbr._modules.clear() |
| 83 elif ( | 83 elif ( |
| 84 ext in Preferences.getPython("PythonExtensions") or | |
| 85 ext in Preferences.getPython("Python3Extensions") or | 84 ext in Preferences.getPython("Python3Extensions") or |
| 86 isPyFile | 85 isPyFile |
| 87 ): | 86 ): |
| 88 from . import pyclbr | 87 from . import pyclbr |
| 89 dictionary = pyclbr.readmodule_ex(module, path, isPyFile=isPyFile) | 88 dictionary = pyclbr.readmodule_ex(module, path, isPyFile=isPyFile) |
| 154 return (open(pathname), pathname, (ext, 'r', PTL_SOURCE)) | 153 return (open(pathname), pathname, (ext, 'r', PTL_SOURCE)) |
| 155 raise ImportError | 154 raise ImportError |
| 156 | 155 |
| 157 elif ( | 156 elif ( |
| 158 name.lower().endswith( | 157 name.lower().endswith( |
| 159 tuple(Preferences.getPython("PythonExtensions") + | 158 tuple(Preferences.getPython("Python3Extensions"))) or |
| 160 Preferences.getPython("Python3Extensions"))) or | |
| 161 isPyFile | 159 isPyFile |
| 162 ): | 160 ): |
| 163 for p in path: # search in path | 161 for p in path: # search in path |
| 164 pathname = os.path.join(p, name) | 162 pathname = os.path.join(p, name) |
| 165 if os.path.exists(pathname): | 163 if os.path.exists(pathname): |
