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 | 2ad29dcc55be43dfa4bd95e7acd3671be2dcd765 (patch) | |
| tree | ad304f59d70e4a6b9ee11ca54aa22793fa3b2c45 /pkg_resources | |
| parent | 2e236152228a7d2aec383fcecd70731f96ad4de3 (diff) | |
| parent | 94416707fd59a65f4a8f7f70541d6b3fc018b626 (diff) | |
| download | python-setuptools-git-2ad29dcc55be43dfa4bd95e7acd3671be2dcd765.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 |