diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-07-05 13:34:34 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-07-05 13:34:34 -0400 |
| commit | f3829d8bd0cd852be133f8822aa4493a7a12fd51 (patch) | |
| tree | 7d3e5b28775f9b6e5b489de905de009d7221ec90 | |
| parent | b8865685d6cad94c1e5a049ff2f63ae1bbfc1cf2 (diff) | |
| download | external_python_setuptools-f3829d8bd0cd852be133f8822aa4493a7a12fd51.tar.gz external_python_setuptools-f3829d8bd0cd852be133f8822aa4493a7a12fd51.tar.bz2 external_python_setuptools-f3829d8bd0cd852be133f8822aa4493a7a12fd51.zip | |
Use numbers.Number to detect numeric type
| -rw-r--r-- | setuptools/compat.py | 2 | ||||
| -rw-r--r-- | setuptools/dist.py | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/setuptools/compat.py b/setuptools/compat.py index 09e5af5c..507f8e6c 100644 --- a/setuptools/compat.py +++ b/setuptools/compat.py @@ -23,7 +23,6 @@ if PY2: long_type = long maxsize = sys.maxint next = lambda o: o.next() - numeric_types = (int, long, float) unichr = unichr unicode = unicode bytes = str @@ -52,7 +51,6 @@ if PY3: long_type = int maxsize = sys.maxsize next = next - numeric_types = (int, float) unichr = chr unicode = str bytes = bytes diff --git a/setuptools/dist.py b/setuptools/dist.py index 8de95a38..dac4dfa8 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -4,6 +4,7 @@ import re import os import sys import warnings +import numbers import distutils.log import distutils.core import distutils.cmd @@ -13,7 +14,7 @@ from distutils.errors import (DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError) from setuptools.depends import Require -from setuptools.compat import numeric_types, basestring, PY2 +from setuptools.compat import basestring, PY2 import pkg_resources def _get_unpatched(cls): @@ -263,7 +264,7 @@ class Distribution(_Distribution): if not hasattr(self,ep.name): setattr(self,ep.name,None) _Distribution.__init__(self,attrs) - if isinstance(self.metadata.version, numeric_types): + if isinstance(self.metadata.version, numbers.Number): # Some people apparently take "version number" too literally :) self.metadata.version = str(self.metadata.version) |