make kwargs for setup() programmatically

diff --git a/README b/README
index d300d449049f8e25580789dbaf5ad117948993b7..99d69c0279e8d70b4fca9299678062b0716bf49f 100644 (file)
--- a/README
+++ b/README
@@ -203,7 +203,7 @@ the prior release.
 
 REQUIREMENTS
 
-Python 2.2.3 or later.
+Python 2.2 or later.
 
 
 INSTALLATION

diff --git a/setup.py b/setup.py
index b31a693d9e69608b8fd32d88dde01ddc968408a9..5b6d6eef632112048319814199be8a5b2b219441 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -15,15 +15,16 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+import sys
 from distutils.core import setup
 
 version = '1.5.0'
 
-setup(
-    name = 'dnspython',
-    version = version,
-    description = 'DNS toolkit',
-    long_description = \
+kwargs = {
+    'name' : 'dnspython',
+    'version' : version,
+    'description' : 'DNS toolkit',
+    'long_description' : \
     """dnspython is a DNS toolkit for Python. It supports almost all
 record types. It can be used for queries, zone transfers, and dynamic
 updates.  It supports TSIG authenticated messages and EDNS0.
@@ -32,23 +33,26 @@ dnspython provides both high and low level access to DNS. The high
 level classes perform queries for data of a given name, type, and
 class, and return an answer set.  The low level classes allow
 direct manipulation of DNS zones, messages, names, and records.""",
+    'author' : 'Bob Halley',
+    'author_email' : 'halley@dnspython.org',
+    'license' : 'BSD-like',
+    'url' : 'http://www.dnspython.org',
+    'packages' : ['dns', 'dns.rdtypes', 'dns.rdtypes.IN', 'dns.rdtypes.ANY'],
+    }
 
-    author = 'Bob Halley',
-    author_email = 'halley@dnspython.org',
-    license = 'BSD-like',
-    url = 'http://www.dnspython.org',
-    packages = ['dns', 'dns.rdtypes', 'dns.rdtypes.IN', 'dns.rdtypes.ANY'],
-    download_url = \
-       'http://www.dnspython.org/kits/dnspython-%s.tar.gz' % version,
-    classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "Intended Audience :: Developers",
-    "Intended Audience :: System Administrators",
-    "License :: Freeware",
-    "Operating System :: Microsoft :: Windows :: Windows 95/98/2000",
-    "Operating System :: POSIX",
-    "Programming Language :: Python",
-    "Topic :: Internet :: Name Service (DNS)",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    ],
-    )
+if sys.hexversion >= 0x02020300:
+    kwargs['download_url'] = \
+       'http://www.dnspython.org/kits/dnspython-%s.tar.gz' % version
+    kwargs['classifiers'] = [
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "Intended Audience :: System Administrators",
+        "License :: Freeware",
+        "Operating System :: Microsoft :: Windows :: Windows 95/98/2000",
+        "Operating System :: POSIX",
+        "Programming Language :: Python",
+        "Topic :: Internet :: Name Service (DNS)",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        ]
+
+setup(**kwargs)