Merge branch 'buildoutscript-for-stats'.
diff --git a/scripts/stats.py b/scripts/stats.py
index f8bd6f2..d4d7a7a 100755
--- a/scripts/stats.py
+++ b/scripts/stats.py
@@ -754,7 +754,7 @@
super(StudentKeyRequest, self).__init__(post=dict(student_key=key))
-def main(args):
+def main():
"""Main routine.
"""
@@ -860,11 +860,11 @@
'turnaroundTime': turnaroundTime,
}
- interactive.remote(args, context)
+ interactive.remote(sys.argv[1:], context)
if __name__ == '__main__':
if len(sys.argv) < 2:
print "Usage: %s app_id [host]" % (sys.argv[0],)
sys.exit(1)
- main(sys.argv[1:])
+ main()
diff --git a/setup.py b/setup.py
index 2a811ba..3618e73 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@
],
entry_points = {'console_scripts': ['run-tests = tests.run:main',
'gen-app-yaml = scripts.gen_app_yaml:main',
+ 'stats = scripts.stats:main'
],
},
include_package_data = True,
diff --git a/tests/app/soc/views/test_org_app.py b/tests/app/soc/views/test_org_app.py
index 1dbb1db..2c58a34 100644
--- a/tests/app/soc/views/test_org_app.py
+++ b/tests/app/soc/views/test_org_app.py
@@ -135,7 +135,7 @@
'agreed_to_admin_agreement': True,
'backup_admin_id': backup_admin_profile.link_id,
}
-
+
def testOrgAppCreateOrEditByProgramAdmin(self):
"""Tests that program admin can create an organization application.
"""