Merge lp:~zooko/txamqp/389358-support-setuptools into lp:txamqp

[Terry Jones]

[Terry Jones (terrycojones)]

This looks good to go. I didn't test everything, but I tried a few things and they appeared to work fine.

=== modified file 'setup.py'
--- setup.py	2009-05-22 15:29:06 +0000
+++ setup.py	2009-07-13 21:08:24 +0000
@@ -1,16 +1,24 @@
-from distutils.core import setup
-from glob import glob
+setupdict= {
+    'name': 'txAMQP',
+    'version': '0.2',
+    'author': 'Esteve Fernandez',
+    'author_email': '[e-mail]',
+    'url': 'https://launchpad.net/txamqp',
+    }
 
-setup(
-    name = 'txAMQP',
-    version = '0.2',
-    author = 'Esteve Fernandez',
-    author_email = '[e-mail]',
-    packages = ['txamqp', 'txamqp.contrib', 'txamqp.contrib.thrift'],
-    package_dir = {
+try:
+    from setuptools import setup, find_packages
+except ImportError:
+    from distutils.core import setup
+    setupdict['packages'] = ['txamqp', 'txamqp.contrib', 'txamqp.contrib.thrift']
+    setupdict['package_dir'] = {
         'txamqp': 'src/txamqp',
         'txamqp.contrib': 'src/txamqp/contrib',
         'txamqp.contrib.thrift': 'src/txamqp/contrib/thrift',
-        },
-    url = 'https://launchpad.net/txamqp',
-)
+    },
+else:
+    setupdict['packages'] = find_packages('src')
+    setupdict['package_dir'] = { '': 'src' }
+    setupdict['install_requires'] = ['Twisted']
+        
+setup(**setupdict)