diff options
| author | Daniel Holth <dholth@fastmail.fm> | 2013-07-20 11:15:20 -0400 |
|---|---|---|
| committer | Daniel Holth <dholth@fastmail.fm> | 2013-07-20 11:15:20 -0400 |
| commit | 28efa26aa909ea60533c0719ed5f7aaa6adf8fb2 (patch) | |
| tree | 40a5425921867e6912f171033735878ca70b8ecc | |
| parent | d01d1da2bed3f0ebefde89878e1e1597f3c50ca1 (diff) | |
| download | external_python_setuptools-28efa26aa909ea60533c0719ed5f7aaa6adf8fb2.tar.gz external_python_setuptools-28efa26aa909ea60533c0719ed5f7aaa6adf8fb2.tar.bz2 external_python_setuptools-28efa26aa909ea60533c0719ed5f7aaa6adf8fb2.zip | |
add _-separated keys to environment markers
| -rw-r--r-- | _markerlib/markers.py | 4 | ||||
| -rw-r--r-- | setuptools/tests/test_markerlib.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/_markerlib/markers.py b/_markerlib/markers.py index c93d7f3b..fa837061 100644 --- a/_markerlib/markers.py +++ b/_markerlib/markers.py @@ -49,6 +49,10 @@ _VARS = {'sys.platform': sys.platform, 'extra': None # wheel extension } +for var in list(_VARS.keys()): + if '.' in var: + _VARS[var.replace('.', '_')] = _VARS[var] + def default_environment(): """Return copy of default PEP 385 globals dictionary.""" return dict(_VARS) diff --git a/setuptools/tests/test_markerlib.py b/setuptools/tests/test_markerlib.py index aa461846..dae71cba 100644 --- a/setuptools/tests/test_markerlib.py +++ b/setuptools/tests/test_markerlib.py @@ -19,20 +19,24 @@ class TestMarkerlib(unittest.TestCase): self.assertTrue(interpret("")) self.assertTrue(interpret("os.name != 'buuuu'")) + self.assertTrue(interpret("os_name != 'buuuu'")) self.assertTrue(interpret("python_version > '1.0'")) self.assertTrue(interpret("python_version < '5.0'")) self.assertTrue(interpret("python_version <= '5.0'")) self.assertTrue(interpret("python_version >= '1.0'")) self.assertTrue(interpret("'%s' in os.name" % os_name)) + self.assertTrue(interpret("'%s' in os_name" % os_name)) self.assertTrue(interpret("'buuuu' not in os.name")) self.assertFalse(interpret("os.name == 'buuuu'")) + self.assertFalse(interpret("os_name == 'buuuu'")) self.assertFalse(interpret("python_version < '1.0'")) self.assertFalse(interpret("python_version > '5.0'")) self.assertFalse(interpret("python_version >= '5.0'")) self.assertFalse(interpret("python_version <= '1.0'")) self.assertFalse(interpret("'%s' not in os.name" % os_name)) self.assertFalse(interpret("'buuuu' in os.name and python_version >= '5.0'")) + self.assertFalse(interpret("'buuuu' in os_name and python_version >= '5.0'")) environment = default_environment() environment['extra'] = 'test' |