Move to using setuptools exclusively.
Take the opportunity to clean up contrib/ as all that functionality
has been subsumed in the oauth2decorator.
Reviwed in http://codereview.appspot.com/5271053/
diff --git a/bin/enable-app-engine-project b/bin/enable-app-engine-project
index b67cde8..e2f2a35 100755
--- a/bin/enable-app-engine-project
+++ b/bin/enable-app-engine-project
@@ -30,6 +30,7 @@
import logging
import sys
import os
+import pkg_resources
from distutils.dir_util import copy_tree
from distutils.file_util import copy_file
@@ -72,13 +73,13 @@
basename = os.path.basename(m.__file__)
if basename.startswith('__init__.'):
isdir = True
- location = os.path.dirname(m.__file__)
+ location = os.path.dirname(
+ pkg_resources.resource_filename(module, '__init__.py'))
else:
if os.path.isfile(m.__file__):
location = m.__file__.rsplit('.', 1)[0] + '.py'
else:
# The file is an egg, extract to a temporary location
- import pkg_resources
location = pkg_resources.resource_filename(module, module + '.py')
return (isdir, location)
@@ -103,8 +104,8 @@
# Check if the supplied directory is an App Engine project by looking
# for an app.yaml
if not os.path.isfile(os.path.join(dir, 'app.yaml')):
- sys.exit('The given directory is not a Google App Engine project: %s' % dir)
-
+ sys.exit('The given directory is not a Google App Engine project: %s' %
+ dir)
# Build up the set of file or directory copying actions we need to do
action = [] # (src, dst, isdir)