Merge pull request #227 from paradoxxxzero/master

Fix python implementation marker for setuptools 2.20; r=gsnedders

Author: gsnedders

setup.py

@@ -65,8 +65,8 @@
 
           # A conditional extra will only install these items when the extra is
           # requested and the condition matches.
-          "datrie:python_implementation == 'CPython'": ["datrie"],
-          "lxml:python_implementation == 'CPython'": ["lxml"],
+          "datrie:platform_python_implementation == 'CPython'": ["datrie"],
+          "lxml:platform_python_implementation == 'CPython'": ["lxml"],
 
           # Standard extras, will be installed when the extra is requested.
           "genshi": ["genshi"],
@@ -77,6 +77,6 @@
           # extra that will be installed whenever the condition matches and the
           # all extra is requested.
           "all": ["genshi", "charade"],
-          "all:python_implementation == 'CPython'": ["datrie", "lxml"],
+          "all:platform_python_implementation == 'CPython'": ["datrie", "lxml"],
       },
       )