diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-11-01 12:11:58 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-11-01 12:11:58 -0500 |
| commit | 92db16d3d8ffaea2877c893def585604ee735371 (patch) | |
| tree | 100519a0a727a42201999d7b66c7af1d9f8c6745 /pkg_resources | |
| parent | edb301b598d7009d923d9b0124d6f5b2fa9e8f15 (diff) | |
| parent | b284f0d59144e667e030e732d0bb10092a5b0399 (diff) | |
| download | python-setuptools-bitbucket-92db16d3d8ffaea2877c893def585604ee735371.tar.gz | |
Merge pull request #28 from rouge8/platform_python_implementation
Add support for python_platform_implementation environment marker
Diffstat (limited to 'pkg_resources')
| -rw-r--r-- | pkg_resources/__init__.py | 1 | ||||
| -rw-r--r-- | pkg_resources/api_tests.txt | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index fb8704fd..d09e0b6f 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -1410,6 +1410,7 @@ class MarkerEvaluation(object): 'python_version': lambda: platform.python_version()[:3], 'platform_version': platform.version, 'platform_machine': platform.machine, + 'platform_python_implementation': platform.python_implementation, 'python_implementation': platform.python_implementation, } diff --git a/pkg_resources/api_tests.txt b/pkg_resources/api_tests.txt index 1c852e81..d28db0f5 100644 --- a/pkg_resources/api_tests.txt +++ b/pkg_resources/api_tests.txt @@ -420,3 +420,6 @@ Environment Markers >>> em("python_version > '2.5'") True + + >>> im("platform_python_implementation=='CPython'") + False |