aboutsummaryrefslogtreecommitdiffstats
path: root/pkg_resources.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-06-07 20:08:21 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-06-07 20:08:21 -0400
commit34160eb2ed3da6bf4f57c882ccdd5d6fab3bc76b (patch)
treedea4d211c12cfb96dce864b286f37bff15ffe86f /pkg_resources.py
parent6b694814e0f877a45aff1091849ec09abd8f0ed2 (diff)
downloadexternal_python_setuptools-34160eb2ed3da6bf4f57c882ccdd5d6fab3bc76b.tar.gz
external_python_setuptools-34160eb2ed3da6bf4f57c882ccdd5d6fab3bc76b.tar.bz2
external_python_setuptools-34160eb2ed3da6bf4f57c882ccdd5d6fab3bc76b.zip
Resave with excess whitespace removed
Diffstat (limited to 'pkg_resources.py')
-rw-r--r--pkg_resources.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/pkg_resources.py b/pkg_resources.py
index 5b095562..ea6cf8bb 100644
--- a/pkg_resources.py
+++ b/pkg_resources.py
@@ -1201,14 +1201,14 @@ def _pyimp():
elif '__pypy__' in sys.builtin_module_names:
return 'PyPy'
else:
- return 'CPython'
+ return 'CPython'
def invalid_marker(text):
"""Validate text as a PEP 426 environment marker; return exception or False"""
try:
evaluate_marker(text)
except SyntaxError:
- return sys.exc_info()[1]
+ return sys.exc_info()[1]
return False
def evaluate_marker(text, extra=None, _ops={}):
@@ -1218,15 +1218,15 @@ def evaluate_marker(text, extra=None, _ops={}):
from token import NAME, STRING
import token, symbol, operator
-
+
def and_test(nodelist):
# MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
return reduce(operator.and_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
-
+
def test(nodelist):
# MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
return reduce(operator.or_, [interpret(nodelist[i]) for i in range(1,len(nodelist),2)])
-
+
def atom(nodelist):
t = nodelist[1][0]
if t == token.LPAR:
@@ -1234,7 +1234,7 @@ def evaluate_marker(text, extra=None, _ops={}):
raise SyntaxError("Empty parentheses")
return interpret(nodelist[2])
raise SyntaxError("Language feature not supported in environment markers")
-
+
def comparison(nodelist):
if len(nodelist)>4:
raise SyntaxError("Chained comparison not allowed in environment markers")
@@ -1251,7 +1251,7 @@ def evaluate_marker(text, extra=None, _ops={}):
except KeyError:
raise SyntaxError(repr(cop)+" operator not allowed in environment markers")
return cop(evaluate(nodelist[1]), evaluate(nodelist[3]))
-
+
_ops.update({
symbol.test: test, symbol.and_test: and_test, symbol.atom: atom,
symbol.comparison: comparison, 'not in': lambda x,y: x not in y,
@@ -1268,7 +1268,7 @@ def evaluate_marker(text, extra=None, _ops={}):
raise SyntaxError("Comparison or logical expression expected")
raise SyntaxError("Language feature not supported in environment markers: "+symbol.sym_name[nodelist[0]])
return op(nodelist)
-
+
def evaluate(nodelist):
while len(nodelist)==2: nodelist = nodelist[1]
kind = nodelist[0]
@@ -1289,7 +1289,7 @@ def evaluate_marker(text, extra=None, _ops={}):
return s[1:-1]
raise SyntaxError("Language feature not supported in environment markers")
- import parser
+ import parser
return interpret(parser.expr(text).totuple(1)[1])
@@ -2393,7 +2393,7 @@ class Distribution(object):
reqs=[] # XXX warn
elif not evaluate_marker(marker):
reqs=[]
- extra = safe_extra(extra) or None
+ extra = safe_extra(extra) or None
dm.setdefault(extra,[]).extend(parse_requirements(reqs))
return dm
_dep_map = property(_dep_map)