[Debconf-video-commits] r377 - in package/branches/pycon09/src: . pyconvideo

[benh at alioth.debian.org]

Author: benh
Date: 2009-03-23 23:58:11 +0000 (Mon, 23 Mar 2009)
New Revision: 377

Added:
   package/branches/pycon09/src/django_manage.py
Removed:
   package/branches/pycon09/src/pyconvideo/manage.py
Log:
Move manage.py up out of pyconvideo so that Python doesn't confuse the pyconvideo (site) and pyconvideo.pyconvideo (application) packages.


Copied: package/branches/pycon09/src/django_manage.py (from rev 376, package/branches/pycon09/src/pyconvideo/manage.py)
===================================================================
--- package/branches/pycon09/src/django_manage.py	                        (rev 0)
+++ package/branches/pycon09/src/django_manage.py	2009-03-23 23:58:11 UTC (rev 377)
@@ -0,0 +1,6 @@
+#!/usr/bin/python
+from django.core.management import execute_manager
+from pyconvideo import settings
+
+if __name__ == "__main__":
+    execute_manager(settings)


Property changes on: package/branches/pycon09/src/django_manage.py
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:mergeinfo
   + 

Deleted: package/branches/pycon09/src/pyconvideo/manage.py
===================================================================
--- package/branches/pycon09/src/pyconvideo/manage.py	2009-03-23 23:27:28 UTC (rev 376)
+++ package/branches/pycon09/src/pyconvideo/manage.py	2009-03-23 23:58:11 UTC (rev 377)
@@ -1,11 +0,0 @@
-#!/usr/bin/python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)