Commits

Jason R. Coombs  committed 5096d55 Merge

Merge fix for issue 194

  • Participants
  • Parent commits dea6ddf, a767130
  • Branches jaraco.httplib2

Comments (0)

Files changed (4)

 upload.py
 **.pyc
 .cache
+MANIFEST

File MANIFEST

-README
-setup.py
-python2/httplib2/__init__.py
-python2/httplib2/iri2uri.py
-python2/httplib2/socks.py
-python2/httplib2/test/__init__.py
-python2/httplib2/test/functional/test_proxies.py
-python2/httplib2/test/miniserver.py
-python2/httplib2/test/smoke_test.py
-python2/httplib2test.py
-python3/httplib2/__init__.py
-python3/httplib2/iri2uri.py
-python3/httplib2test.py
+recursive-include python2 *.py
+recursive-include python3 *.py
+include python2/httplib2/test/*.txt
-from distutils.core import setup
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 import sys
 
 package_dir = {'jaraco.httplib2': 'python%s/httplib2' % sys.version_info[0]}