From 9aa4344dbcbd59376dd53b904b0471425219a2e1 Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Thu, 9 Feb 2012 16:32:06 -0600
Subject: [PATCH] Removed requirement that project have any certain name.
---
gracedb/alert.py | 2 +-
gracedb/buildVOEvent.py | 7 ++++---
gracedb/middleware/__init__.py | 0
{middleware => gracedb/middleware}/auth.py | 2 +-
gracedb/models.py | 3 ++-
gracedb/templatetags/timeutil.py | 3 ++-
gracedb/urls.py | 2 +-
gracedb/views.py | 2 +-
manage.py | 6 ------
settings/__init__.py | 3 +++
settings/default.py | 12 ++++++------
urls.py | 22 +++++++++++-----------
userprofile/models.py | 2 +-
userprofile/urls.py | 2 +-
userprofile/views.py | 2 +-
15 files changed, 35 insertions(+), 35 deletions(-)
create mode 100644 gracedb/middleware/__init__.py
rename {middleware => gracedb/middleware}/auth.py (99%)
diff --git a/gracedb/alert.py b/gracedb/alert.py
index 3399ed912..10dc7791f 100644
--- a/gracedb/alert.py
+++ b/gracedb/alert.py
@@ -9,7 +9,7 @@ from django.conf import settings
from django.contrib.sites.models import Site
from django.core.urlresolvers import reverse, get_script_prefix
-from gracedb.userprofile.models import Trigger, AnalysisType
+from userprofile.models import Trigger, AnalysisType
import glue.ligolw.utils
import glue.lvalert.utils
diff --git a/gracedb/buildVOEvent.py b/gracedb/buildVOEvent.py
index 5305db2fa..e83a2145b 100755
--- a/gracedb/buildVOEvent.py
+++ b/gracedb/buildVOEvent.py
@@ -8,11 +8,12 @@ See the VOEvent specification for details
http://www.ivoa.net/Documents/latest/VOEvent.html
"""
-from gracedb.VOEventLib.VOEvent import *
-from gracedb.VOEventLib.Vutil import *
+from VOEventLib.VOEvent import *
+from VOEventLib.Vutil import *
import sys, os
-from gracedb.utils import gpsToUtc
+# XXX ER2.utils. utils is in project directory. ugh.
+from utils import gpsToUtc
from django.conf import settings
def buildVOEvent(gevent):
diff --git a/gracedb/middleware/__init__.py b/gracedb/middleware/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/middleware/auth.py b/gracedb/middleware/auth.py
similarity index 99%
rename from middleware/auth.py
rename to gracedb/middleware/auth.py
index f9b0ef0ae..e2d85da63 100644
--- a/middleware/auth.py
+++ b/gracedb/middleware/auth.py
@@ -1,7 +1,7 @@
from django.contrib.auth import authenticate
-from gracedb.gracedb.models import User
+from gracedb.models import User
from django.contrib.auth.models import User as DjangoUser
import re
diff --git a/gracedb/models.py b/gracedb/models.py
index feea69288..0eae6c928 100644
--- a/gracedb/models.py
+++ b/gracedb/models.py
@@ -5,7 +5,8 @@ import string
import os
-from gracedb.utils import posixToGpsTime
+# XXX ER2.utils. utils is in project directory. ugh.
+from utils import posixToGpsTime
from django.conf import settings
import pytz, time
diff --git a/gracedb/templatetags/timeutil.py b/gracedb/templatetags/timeutil.py
index a3d5da3d4..0938dc542 100644
--- a/gracedb/templatetags/timeutil.py
+++ b/gracedb/templatetags/timeutil.py
@@ -6,7 +6,8 @@ from django.utils import dateformat
from django.utils.html import conditional_escape
from django.utils.safestring import mark_safe
-from gracedb.utils import posixToGpsTime, gpsToUtc
+# XXX utils is in the project root. this is not right. ER2.utils
+from utils import posixToGpsTime, gpsToUtc
import pytz
import time
diff --git a/gracedb/urls.py b/gracedb/urls.py
index 8344a9cf5..7a2046701 100644
--- a/gracedb/urls.py
+++ b/gracedb/urls.py
@@ -3,7 +3,7 @@ from django.conf.urls.defaults import *
#import django.views.generic.list_detail
-urlpatterns = patterns('gracedb.gracedb.views',
+urlpatterns = patterns('gracedb.views',
url (r'^$', 'index', name="home"),
url (r'^create/$', 'create', name="create"),
url (r'^search/(?P<format>(json|flex))?$', 'search', name="search"),
diff --git a/gracedb/views.py b/gracedb/views.py
index 487cb5356..9530093dd 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -720,7 +720,7 @@ def oldsearch(request):
context_instance=RequestContext(request))
def timeline(request):
- from gracedb.utils import gpsToUtc
+ from utils import gpsToUtc
from django.utils import dateformat
response = HttpResponse(mimetype='application/javascript')
diff --git a/manage.py b/manage.py
index b6f360910..aac8ce41a 100755
--- a/manage.py
+++ b/manage.py
@@ -1,12 +1,6 @@
#!/usr/bin/env python
from django.core.management import execute_manager
-# THIS IS TERRIBLE, but some idiot named the project AND application gracedb.
-# Things looking for gracedb.settings fail because they find the app not the proj.
-# This also causes things wanting the app having to do gracedb.gracedb.whatever
-# all the time, but that mess has already been made.
-import sys, os
-sys.path.insert(0, os.path.join(os.path.dirname(__file__),'..'))
try:
import settings # Assumed to be in the same directory.
diff --git a/settings/__init__.py b/settings/__init__.py
index 62596fd56..b5a9d97d9 100644
--- a/settings/__init__.py
+++ b/settings/__init__.py
@@ -17,6 +17,9 @@ ROOT_PATH = os.path.abspath( os.path.join( os.path.dirname(__file__), os.pardir
configs = {
'/home/bmoe/ER2': 'development_er2',
'/home/bmoe/er2box/lib/python2.6/site-packages/gracedb' : 'development_er2',
+
+ '/home/bmoe/er2box/lib/python2.6/site-packages/ER2' : 'development_er2',
+
'/home/bmoe/gracedb': 'development',
'/home/gracedb/gracedb': 'production',
}
diff --git a/settings/default.py b/settings/default.py
index a4a9f3e89..1fb9c0f39 100644
--- a/settings/default.py
+++ b/settings/default.py
@@ -150,21 +150,21 @@ TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.media",
"django.core.context_processors.request",
"gracedb.middleware.auth.LigoAuthContext",
- 'gracedb.middleware.debug.LigoDebugContext',
+ 'middleware.debug.LigoDebugContext',
)
AUTHENTICATION_BACKENDS = ('gracedb.middleware.auth.LigoAuthBackend',)
MIDDLEWARE_CLASSES = [
- 'gracedb.middleware.accept.AcceptMiddleware',
+ 'middleware.accept.AcceptMiddleware',
'gracedb.middleware.auth.LigoAuthMiddleware',
- 'gracedb.middleware.cli.CliExceptionMiddleware',
+ 'middleware.cli.CliExceptionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
]
-ROOT_URLCONF = 'gracedb.urls'
+ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -179,6 +179,6 @@ INSTALLED_APPS = (
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
- 'gracedb.gracedb',
- 'gracedb.userprofile',
+ 'gracedb',
+ 'userprofile',
)
diff --git a/urls.py b/urls.py
index 9d2d04ede..021b2905c 100644
--- a/urls.py
+++ b/urls.py
@@ -14,20 +14,20 @@ feeds = {
urlpatterns = patterns('',
- url (r'^$', 'gracedb.gracedb.views.index', name="home"),
- (r'^events/', include('gracedb.gracedb.urls')),
- (r'^options/', include('gracedb.userprofile.urls')),
- (r'^cli/create', 'gracedb.gracedb.views.create'),
- (r'^cli/ping', 'gracedb.gracedb.views.ping'),
- (r'^cli/log', 'gracedb.gracedb.views.log'),
- (r'^cli/upload', 'gracedb.gracedb.views.upload'),
- (r'^cli/tag', 'gracedb.gracedb.views.cli_tag'),
- (r'^cli/label', 'gracedb.gracedb.views.cli_label'),
- (r'^cli/search', 'gracedb.gracedb.views.cli_search'),
+ url (r'^$', 'gracedb.views.index', name="home"),
+ (r'^events/', include('gracedb.urls')),
+ (r'^options/', include('userprofile.urls')),
+ (r'^cli/create', 'gracedb.views.create'),
+ (r'^cli/ping', 'gracedb.views.ping'),
+ (r'^cli/log', 'gracedb.views.log'),
+ (r'^cli/upload', 'gracedb.views.upload'),
+ (r'^cli/tag', 'gracedb.views.cli_tag'),
+ (r'^cli/label', 'gracedb.views.cli_label'),
+ (r'^cli/search', 'gracedb.views.cli_search'),
(r'^feeds/(?P<url>.*)/$', EventFeed()),
url (r'^feeds/$', feedview, name="feeds"),
- url (r'^reports/$', 'gracedb.gracedb.reports.histo', name="reports"),
+ url (r'^reports/$', 'gracedb.reports.histo', name="reports"),
(r'^reports/(?P<path>.+)$', 'django.views.static.serve',
{'document_root': settings.LATENCY_REPORT_DEST_DIR}),
diff --git a/userprofile/models.py b/userprofile/models.py
index ba3ad70dc..dbabd67bf 100644
--- a/userprofile/models.py
+++ b/userprofile/models.py
@@ -1,7 +1,7 @@
from django.db import models
-from gracedb.gracedb.models import User, Label, Event
+from gracedb.models import User, Label, Event
#class Notification(models.Model):
diff --git a/userprofile/urls.py b/userprofile/urls.py
index 00f08d595..e531245f3 100644
--- a/userprofile/urls.py
+++ b/userprofile/urls.py
@@ -2,7 +2,7 @@
from django.conf.urls.defaults import *
-urlpatterns = patterns('gracedb.userprofile.views',
+urlpatterns = patterns('userprofile.views',
url (r'^$', 'index', name="userprofile-home"),
url (r'^contact/create$', 'createContact', name="userprofile-create-contact"),
url (r'^contact/delete/(?P<id>[\d]+)$', 'deleteContact', name="userprofile-delete-contact"),
diff --git a/userprofile/views.py b/userprofile/views.py
index 25f8c3d87..d2d3ddea7 100644
--- a/userprofile/views.py
+++ b/userprofile/views.py
@@ -8,7 +8,7 @@ from django.core.urlresolvers import reverse
from django.template import RequestContext
from django.shortcuts import render_to_response
-from gracedb.userprofile.models import Trigger, Contact
+from models import Trigger, Contact
from forms import ContactForm, triggerFormFactory
--
GitLab