Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Thompson <quornian@googlemail.com>2008-08-08 19:54:04 +0400
committerIan Thompson <quornian@googlemail.com>2008-08-08 19:54:04 +0400
commitd42891975b4b7c8a02c59c0567f68ce24e41f3e3 (patch)
treea0b662764da5f18b5e1abab0954468921cfedc7e /release
parenta821c8af1e91bf27e52c0d1bc8991ecfaf981c28 (diff)
Typing 'from a import b' threw an error if b was not found. Accidentally moved this out of the try block in an earlier tidy-up.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/bpymodules/BPyTextPlugin.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/release/scripts/bpymodules/BPyTextPlugin.py b/release/scripts/bpymodules/BPyTextPlugin.py
index 5143229f829..870194880b3 100644
--- a/release/scripts/bpymodules/BPyTextPlugin.py
+++ b/release/scripts/bpymodules/BPyTextPlugin.py
@@ -237,10 +237,9 @@ def parse_text(txt):
# Try importing name as an attribute of the parent
try:
module = __import__(imp_from, globals(), locals(), [imp_name])
+ imports[imp_symb] = getattr(module, imp_name)
except (ImportError, ValueError, AttributeError, TypeError):
pass
- else:
- imports[imp_symb] = getattr(module, imp_name)
else:
imports[imp_symb] = module