diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-08 16:04:12 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-08 16:04:12 -0400 |
| commit | 0cfd8865097b9093ee1fd50c49ceabad411c885e (patch) | |
| tree | d8c2bd9867dcf52c282f7ffbefcc65354c2e938e | |
| parent | 054a029a61fcf8257d0af0619810c2e4b384e30e (diff) | |
| download | external_python_setuptools-0cfd8865097b9093ee1fd50c49ceabad411c885e.tar.gz external_python_setuptools-0cfd8865097b9093ee1fd50c49ceabad411c885e.tar.bz2 external_python_setuptools-0cfd8865097b9093ee1fd50c49ceabad411c885e.zip | |
Translate NameError into SyntaxError to meet prescribed API
--HG--
extra : histedit_source : 6ed89212bff75512c980d3fc0f98117510f3b576
| -rw-r--r-- | pkg_resources.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 4225ae55..83901bb8 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -1316,7 +1316,12 @@ def evaluate_marker(text): for key in env.keys(): new_key = key.replace('.', '_') env[new_key] = env.pop(key) - return _markerlib.interpret(text, env) + try: + result = _markerlib.interpret(text, env) + except NameError: + e = sys.exc_info()[1] + raise SyntaxError(e.args[0]) + return result # support marker evaluation on Python 2.4+ if sys.version_info < (2,6) and _pyimp() == 'CPython': |