--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# Bootstrap installation of Distribute
-import distribute_setup
-distribute_setup.use_setuptools()
-
 from setuptools import setup, find_packages
 
 try:
@@ -43,5 +39,4 @@
     include_package_data=True,
     install_requires=requires,
     namespace_packages=['sphinxcontrib'],
-    py_modules = [ 'distribute_setup' ],
 )
Only in src/: sphinxcontrib-bitbucket-1.0/setup.py.orig
--- a/sphinxcontrib/bitbucket.py
+++ b/sphinxcontrib/bitbucket.py
@@ -23,7 +23,7 @@
         base = app.config.bitbucket_project_url
         if not base:
             raise AttributeError
-    except AttributeError, err:
+    except AttributeError as err:
         raise ValueError('bitbucket_project_url configuration value is not set (%s)' % str(err))
     #
     slash = '/' if base[-1] != '/' else ''