Final beta6 changes

Makefile

@@ -42,7 +42,6 @@ oauth2_prerelease:
 	python expand-symlinks.py --source=samples/appengine_with_decorator2 --dest=snapshot/samples/appengine_with_decorator2
 	python expand-symlinks.py --source=samples/appengine --dest=snapshot/samples/appengine
 	cp setup_oauth2client.py snapshot/setup.py
-	cp setup_utils.py snapshot/setup_utils.py
 	cp MANIFEST_oauth2client.in snapshot/MANIFEST.in
 	cp README_oauth2client snapshot/README
 	cd snapshot; python setup.py clean

setup_oauth2client.py

@@ -31,7 +31,7 @@ install_requires = [
 try:
   import json
   needs_json = False
-except ImportError
+except ImportError:
   needs_json = True
 
 if needs_json:
@@ -40,7 +40,7 @@ if needs_json:
 long_desc = """The oauth2client is a client library for OAuth 2.0."""
 
 setup(name="oauth2client",
-      version="1.0beta5prerelease",
+      version="1.0beta6",
       description="OAuth 2.0 client library",
       long_description=long_desc,
       author="Joe Gregorio",
@@ -48,7 +48,6 @@ setup(name="oauth2client",
       url="http://code.google.com/p/google-api-python-client/",
       install_requires=install_requires,
       packages=packages,
-      py_modules=py_modules,
       license="Apache 2.0",
       keywords="google oauth 2.0 http client",
       classifiers=['Development Status :: 4 - Beta',