txAMQP

 === 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': 'esteve@fluidinfo.com',
++    'url': 'https://launchpad.net/txamqp',
++    }
--setup(
--    name = 'txAMQP',
--    version = '0.2',
--    author = 'Esteve Fernandez',
--    author_email = 'esteve@fluidinfo.com',
--    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)

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