[cig-commits] r6190 - in cs/pythia/trunk/opal: conf
conf/app_template conf/project_template conf/urls
contrib/admin contrib/admin/templatetags contrib/admin/views
contrib/auth contrib/auth/handlers contrib/comments
contrib/comments/templatetags contrib/comments/urls
contrib/comments/views contrib/contenttypes contrib/csrf
contrib/flatpages contrib/markup/templatetags
contrib/redirects contrib/sessions contrib/sites
contrib/syndication core core/cache core/cache/backends
core/handlers core/serializers core/servers db
db/backends/ado_mssql db/backends/dummy db/backends/mysql
db/backends/oracle db/backends/postgresql
db/backends/postgresql_psycopg2 db/backends/sqlite3 db/models
db/models/fields dispatch forms http middleware scripts
shortcuts template template/loaders templatetags utils
utils/simplejson utils/translation views views/decorators
views/generic
leif at geodynamics.org
leif at geodynamics.org
Wed Mar 7 21:06:43 PST 2007
Author: leif
Date: 2007-03-07 21:06:36 -0800 (Wed, 07 Mar 2007)
New Revision: 6190
Modified:
cs/pythia/trunk/opal/conf/__init__.py
cs/pythia/trunk/opal/conf/app_template/models.py
cs/pythia/trunk/opal/conf/global_settings.py
cs/pythia/trunk/opal/conf/project_template/manage.py
cs/pythia/trunk/opal/conf/project_template/settings.py
cs/pythia/trunk/opal/conf/project_template/urls.py
cs/pythia/trunk/opal/conf/urls/admin_password_reset.py
cs/pythia/trunk/opal/conf/urls/defaults.py
cs/pythia/trunk/opal/conf/urls/i18n.py
cs/pythia/trunk/opal/conf/urls/registration.py
cs/pythia/trunk/opal/conf/urls/shortcut.py
cs/pythia/trunk/opal/contrib/admin/filterspecs.py
cs/pythia/trunk/opal/contrib/admin/models.py
cs/pythia/trunk/opal/contrib/admin/templatetags/admin_list.py
cs/pythia/trunk/opal/contrib/admin/templatetags/admin_modify.py
cs/pythia/trunk/opal/contrib/admin/templatetags/adminapplist.py
cs/pythia/trunk/opal/contrib/admin/templatetags/adminmedia.py
cs/pythia/trunk/opal/contrib/admin/templatetags/log.py
cs/pythia/trunk/opal/contrib/admin/urls.py
cs/pythia/trunk/opal/contrib/admin/views/decorators.py
cs/pythia/trunk/opal/contrib/admin/views/doc.py
cs/pythia/trunk/opal/contrib/admin/views/main.py
cs/pythia/trunk/opal/contrib/admin/views/template.py
cs/pythia/trunk/opal/contrib/auth/__init__.py
cs/pythia/trunk/opal/contrib/auth/backends.py
cs/pythia/trunk/opal/contrib/auth/create_superuser.py
cs/pythia/trunk/opal/contrib/auth/decorators.py
cs/pythia/trunk/opal/contrib/auth/forms.py
cs/pythia/trunk/opal/contrib/auth/handlers/modpython.py
cs/pythia/trunk/opal/contrib/auth/management.py
cs/pythia/trunk/opal/contrib/auth/middleware.py
cs/pythia/trunk/opal/contrib/auth/models.py
cs/pythia/trunk/opal/contrib/auth/views.py
cs/pythia/trunk/opal/contrib/comments/feeds.py
cs/pythia/trunk/opal/contrib/comments/models.py
cs/pythia/trunk/opal/contrib/comments/templatetags/comments.py
cs/pythia/trunk/opal/contrib/comments/urls/comments.py
cs/pythia/trunk/opal/contrib/comments/views/comments.py
cs/pythia/trunk/opal/contrib/comments/views/karma.py
cs/pythia/trunk/opal/contrib/comments/views/userflags.py
cs/pythia/trunk/opal/contrib/contenttypes/management.py
cs/pythia/trunk/opal/contrib/contenttypes/models.py
cs/pythia/trunk/opal/contrib/csrf/middleware.py
cs/pythia/trunk/opal/contrib/flatpages/middleware.py
cs/pythia/trunk/opal/contrib/flatpages/models.py
cs/pythia/trunk/opal/contrib/flatpages/urls.py
cs/pythia/trunk/opal/contrib/flatpages/views.py
cs/pythia/trunk/opal/contrib/markup/templatetags/markup.py
cs/pythia/trunk/opal/contrib/redirects/middleware.py
cs/pythia/trunk/opal/contrib/redirects/models.py
cs/pythia/trunk/opal/contrib/sessions/middleware.py
cs/pythia/trunk/opal/contrib/sessions/models.py
cs/pythia/trunk/opal/contrib/sites/management.py
cs/pythia/trunk/opal/contrib/sites/managers.py
cs/pythia/trunk/opal/contrib/sites/models.py
cs/pythia/trunk/opal/contrib/syndication/feeds.py
cs/pythia/trunk/opal/contrib/syndication/views.py
cs/pythia/trunk/opal/core/cache/__init__.py
cs/pythia/trunk/opal/core/cache/backends/base.py
cs/pythia/trunk/opal/core/cache/backends/db.py
cs/pythia/trunk/opal/core/cache/backends/dummy.py
cs/pythia/trunk/opal/core/cache/backends/filebased.py
cs/pythia/trunk/opal/core/cache/backends/locmem.py
cs/pythia/trunk/opal/core/cache/backends/memcached.py
cs/pythia/trunk/opal/core/cache/backends/simple.py
cs/pythia/trunk/opal/core/context_processors.py
cs/pythia/trunk/opal/core/handler.py
cs/pythia/trunk/opal/core/handlers/base.py
cs/pythia/trunk/opal/core/handlers/modpython.py
cs/pythia/trunk/opal/core/handlers/profiler-hotshot.py
cs/pythia/trunk/opal/core/handlers/wsgi.py
cs/pythia/trunk/opal/core/mail.py
cs/pythia/trunk/opal/core/management.py
cs/pythia/trunk/opal/core/serializers/__init__.py
cs/pythia/trunk/opal/core/serializers/base.py
cs/pythia/trunk/opal/core/serializers/json.py
cs/pythia/trunk/opal/core/serializers/python.py
cs/pythia/trunk/opal/core/serializers/xml_serializer.py
cs/pythia/trunk/opal/core/servers/basehttp.py
cs/pythia/trunk/opal/core/servers/fastcgi.py
cs/pythia/trunk/opal/core/template_loader.py
cs/pythia/trunk/opal/core/urlresolvers.py
cs/pythia/trunk/opal/core/validators.py
cs/pythia/trunk/opal/core/xheaders.py
cs/pythia/trunk/opal/db/__init__.py
cs/pythia/trunk/opal/db/backends/ado_mssql/base.py
cs/pythia/trunk/opal/db/backends/dummy/base.py
cs/pythia/trunk/opal/db/backends/dummy/client.py
cs/pythia/trunk/opal/db/backends/dummy/introspection.py
cs/pythia/trunk/opal/db/backends/mysql/base.py
cs/pythia/trunk/opal/db/backends/mysql/client.py
cs/pythia/trunk/opal/db/backends/mysql/introspection.py
cs/pythia/trunk/opal/db/backends/oracle/base.py
cs/pythia/trunk/opal/db/backends/oracle/client.py
cs/pythia/trunk/opal/db/backends/postgresql/base.py
cs/pythia/trunk/opal/db/backends/postgresql/client.py
cs/pythia/trunk/opal/db/backends/postgresql/introspection.py
cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/base.py
cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/client.py
cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/creation.py
cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/introspection.py
cs/pythia/trunk/opal/db/backends/sqlite3/base.py
cs/pythia/trunk/opal/db/backends/sqlite3/client.py
cs/pythia/trunk/opal/db/backends/sqlite3/introspection.py
cs/pythia/trunk/opal/db/models/__init__.py
cs/pythia/trunk/opal/db/models/base.py
cs/pythia/trunk/opal/db/models/fields/__init__.py
cs/pythia/trunk/opal/db/models/fields/generic.py
cs/pythia/trunk/opal/db/models/fields/related.py
cs/pythia/trunk/opal/db/models/loading.py
cs/pythia/trunk/opal/db/models/manager.py
cs/pythia/trunk/opal/db/models/manipulators.py
cs/pythia/trunk/opal/db/models/options.py
cs/pythia/trunk/opal/db/models/query.py
cs/pythia/trunk/opal/db/transaction.py
cs/pythia/trunk/opal/dispatch/dispatcher.py
cs/pythia/trunk/opal/dispatch/robust.py
cs/pythia/trunk/opal/forms/__init__.py
cs/pythia/trunk/opal/http/__init__.py
cs/pythia/trunk/opal/middleware/cache.py
cs/pythia/trunk/opal/middleware/common.py
cs/pythia/trunk/opal/middleware/doc.py
cs/pythia/trunk/opal/middleware/gzip.py
cs/pythia/trunk/opal/middleware/locale.py
cs/pythia/trunk/opal/middleware/transaction.py
cs/pythia/trunk/opal/scripts/daily_cleanup.py
cs/pythia/trunk/opal/scripts/django-admin.py
cs/pythia/trunk/opal/scripts/make-messages.py
cs/pythia/trunk/opal/shortcuts/__init__.py
cs/pythia/trunk/opal/template/__init__.py
cs/pythia/trunk/opal/template/context.py
cs/pythia/trunk/opal/template/defaultfilters.py
cs/pythia/trunk/opal/template/defaulttags.py
cs/pythia/trunk/opal/template/loader.py
cs/pythia/trunk/opal/template/loader_tags.py
cs/pythia/trunk/opal/template/loaders/app_directories.py
cs/pythia/trunk/opal/template/loaders/eggs.py
cs/pythia/trunk/opal/template/loaders/filesystem.py
cs/pythia/trunk/opal/templatetags/__init__.py
cs/pythia/trunk/opal/templatetags/i18n.py
cs/pythia/trunk/opal/utils/cache.py
cs/pythia/trunk/opal/utils/dateformat.py
cs/pythia/trunk/opal/utils/dates.py
cs/pythia/trunk/opal/utils/feedgenerator.py
cs/pythia/trunk/opal/utils/html.py
cs/pythia/trunk/opal/utils/simplejson/__init__.py
cs/pythia/trunk/opal/utils/simplejson/decoder.py
cs/pythia/trunk/opal/utils/text.py
cs/pythia/trunk/opal/utils/timesince.py
cs/pythia/trunk/opal/utils/translation/__init__.py
cs/pythia/trunk/opal/utils/translation/trans_null.py
cs/pythia/trunk/opal/utils/translation/trans_real.py
cs/pythia/trunk/opal/views/debug.py
cs/pythia/trunk/opal/views/decorators/cache.py
cs/pythia/trunk/opal/views/decorators/gzip.py
cs/pythia/trunk/opal/views/decorators/http.py
cs/pythia/trunk/opal/views/decorators/vary.py
cs/pythia/trunk/opal/views/defaults.py
cs/pythia/trunk/opal/views/generic/create_update.py
cs/pythia/trunk/opal/views/generic/date_based.py
cs/pythia/trunk/opal/views/generic/list_detail.py
cs/pythia/trunk/opal/views/generic/simple.py
cs/pythia/trunk/opal/views/i18n.py
cs/pythia/trunk/opal/views/static.py
Log:
Found & replaced 'django.' -> 'opal.'.
Modified: cs/pythia/trunk/opal/conf/__init__.py
===================================================================
--- cs/pythia/trunk/opal/conf/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,12 +2,12 @@
Settings and configuration for Django.
Values will be read from the module specified by the DJANGO_SETTINGS_MODULE environment
-variable, and then from django.conf.global_settings; see the global settings file for
+variable, and then from opal.conf.global_settings; see the global settings file for
a list of all possible variables.
"""
import os
-from django.conf import global_settings
+from opal.conf import global_settings
ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"
@@ -92,7 +92,7 @@
setting_value = (setting_value,) # In case the user forgot the comma.
setattr(self, setting, setting_value)
- # Expand entries in INSTALLED_APPS like "django.contrib.*" to a list
+ # Expand entries in INSTALLED_APPS like "opal.contrib.*" to a list
# of all those apps.
new_installed_apps = []
for app in self.INSTALLED_APPS:
@@ -134,12 +134,12 @@
settings = LazySettings()
-# This function replaces itself with django.utils.translation.gettext() the
+# This function replaces itself with opal.utils.translation.gettext() the
# first time it's run. This is necessary because the import of
-# django.utils.translation requires a working settings module, and loading it
+# opal.utils.translation requires a working settings module, and loading it
# from within this file would cause a circular import.
def first_time_gettext(*args):
- from django.utils.translation import gettext
+ from opal.utils.translation import gettext
__builtins__['_'] = gettext
return gettext(*args)
Modified: cs/pythia/trunk/opal/conf/app_template/models.py
===================================================================
--- cs/pythia/trunk/opal/conf/app_template/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/app_template/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,3 +1,3 @@
-from django.db import models
+from opal.db import models
# Create your models here.
Modified: cs/pythia/trunk/opal/conf/global_settings.py
===================================================================
--- cs/pythia/trunk/opal/conf/global_settings.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/global_settings.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,7 +2,7 @@
# pointed-to by the DJANGO_SETTINGS_MODULE environment variable.
# This is defined here as a do-nothing function because we can't import
-# django.utils.translation -- that module depends on the settings.
+# opal.utils.translation -- that module depends on the settings.
gettext_noop = lambda s: s
####################
@@ -119,19 +119,19 @@
# See the comments in django/core/template/loader.py for interface
# documentation.
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
-# 'django.template.loaders.eggs.load_template_source',
+ 'opal.template.loaders.filesystem.load_template_source',
+ 'opal.template.loaders.app_directories.load_template_source',
+# 'opal.template.loaders.eggs.load_template_source',
)
# List of processors used by RequestContext to populate the context.
# Each one should be a callable that takes the request object as its
# only parameter and returns a dictionary to add to the context.
TEMPLATE_CONTEXT_PROCESSORS = (
- 'django.core.context_processors.auth',
- 'django.core.context_processors.debug',
- 'django.core.context_processors.i18n',
-# 'django.core.context_processors.request',
+ 'opal.core.context_processors.auth',
+ 'opal.core.context_processors.debug',
+ 'opal.core.context_processors.i18n',
+# 'opal.core.context_processors.request',
)
# Output to use in template system for invalid (e.g. misspelled) variables.
@@ -146,7 +146,7 @@
# the site managers.
DEFAULT_FROM_EMAIL = 'webmaster at localhost'
-# Subject-line prefix for email messages send with django.core.mail.mail_admins
+# Subject-line prefix for email messages send with opal.core.mail.mail_admins
# or ...mail_managers. Make sure to include the trailing space.
EMAIL_SUBJECT_PREFIX = '[Django] '
@@ -237,12 +237,12 @@
# this middleware classes will be applied in the order given, and in the
# response phase the middleware will be applied in reverse order.
MIDDLEWARE_CLASSES = (
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
-# 'django.middleware.http.ConditionalGetMiddleware',
-# 'django.middleware.gzip.GZipMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.doc.XViewMiddleware',
+ 'opal.contrib.sessions.middleware.SessionMiddleware',
+ 'opal.contrib.auth.middleware.AuthenticationMiddleware',
+# 'opal.middleware.http.ConditionalGetMiddleware',
+# 'opal.middleware.gzip.GZipMiddleware',
+ 'opal.middleware.common.CommonMiddleware',
+ 'opal.middleware.doc.XViewMiddleware',
)
############
@@ -259,7 +259,7 @@
# CACHE #
#########
-# The cache backend to use. See the docstring in django.core.cache for the
+# The cache backend to use. See the docstring in opal.core.cache for the
# possible values.
CACHE_BACKEND = 'simple://'
CACHE_MIDDLEWARE_KEY_PREFIX = ''
@@ -294,4 +294,4 @@
# AUTHENTICATION #
##################
-AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
+AUTHENTICATION_BACKENDS = ('opal.contrib.auth.backends.ModelBackend',)
Modified: cs/pythia/trunk/opal/conf/project_template/manage.py
===================================================================
--- cs/pythia/trunk/opal/conf/project_template/manage.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/project_template/manage.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-from django.core.management import execute_manager
+from opal.core.management import execute_manager
try:
import settings # Assumed to be in the same directory.
except ImportError:
Modified: cs/pythia/trunk/opal/conf/project_template/settings.py
===================================================================
--- cs/pythia/trunk/opal/conf/project_template/settings.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/project_template/settings.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -45,16 +45,16 @@
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
-# 'django.template.loaders.eggs.load_template_source',
+ 'opal.template.loaders.filesystem.load_template_source',
+ 'opal.template.loaders.app_directories.load_template_source',
+# 'opal.template.loaders.eggs.load_template_source',
)
MIDDLEWARE_CLASSES = (
- 'django.middleware.common.CommonMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.middleware.doc.XViewMiddleware',
+ 'opal.middleware.common.CommonMiddleware',
+ 'opal.contrib.sessions.middleware.SessionMiddleware',
+ 'opal.contrib.auth.middleware.AuthenticationMiddleware',
+ 'opal.middleware.doc.XViewMiddleware',
)
ROOT_URLCONF = '{{ project_name }}.urls'
@@ -65,8 +65,8 @@
)
INSTALLED_APPS = (
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.sites',
+ 'opal.contrib.auth',
+ 'opal.contrib.contenttypes',
+ 'opal.contrib.sessions',
+ 'opal.contrib.sites',
)
Modified: cs/pythia/trunk/opal/conf/project_template/urls.py
===================================================================
--- cs/pythia/trunk/opal/conf/project_template/urls.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/project_template/urls.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,9 +1,9 @@
-from django.conf.urls.defaults import *
+from opal.conf.urls.defaults import *
urlpatterns = patterns('',
# Example:
# (r'^{{ project_name }}/', include('{{ project_name }}.apps.foo.urls.foo')),
# Uncomment this for admin:
-# (r'^admin/', include('django.contrib.admin.urls')),
+# (r'^admin/', include('opal.contrib.admin.urls')),
)
Modified: cs/pythia/trunk/opal/conf/urls/admin_password_reset.py
===================================================================
--- cs/pythia/trunk/opal/conf/urls/admin_password_reset.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/urls/admin_password_reset.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.conf.urls.defaults import *
+from opal.conf.urls.defaults import *
-urlpatterns = patterns('django.views',
+urlpatterns = patterns('opal.views',
(r'^$', 'registration.passwords.password_reset', {'is_admin_site' : True}),
(r'^done/$', 'registration.passwords.password_reset_done'),
)
Modified: cs/pythia/trunk/opal/conf/urls/defaults.py
===================================================================
--- cs/pythia/trunk/opal/conf/urls/defaults.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/urls/defaults.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,9 +1,9 @@
-from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
+from opal.core.urlresolvers import RegexURLPattern, RegexURLResolver
__all__ = ['handler404', 'handler500', 'include', 'patterns']
-handler404 = 'django.views.defaults.page_not_found'
-handler500 = 'django.views.defaults.server_error'
+handler404 = 'opal.views.defaults.page_not_found'
+handler500 = 'opal.views.defaults.server_error'
include = lambda urlconf_module: [urlconf_module]
Modified: cs/pythia/trunk/opal/conf/urls/i18n.py
===================================================================
--- cs/pythia/trunk/opal/conf/urls/i18n.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/urls/i18n.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
-from django.conf.urls.defaults import *
+from opal.conf.urls.defaults import *
urlpatterns = patterns('',
- (r'^setlang/$', 'django.views.i18n.set_language'),
+ (r'^setlang/$', 'opal.views.i18n.set_language'),
)
Modified: cs/pythia/trunk/opal/conf/urls/registration.py
===================================================================
--- cs/pythia/trunk/opal/conf/urls/registration.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/urls/registration.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,9 +1,9 @@
-from django.conf.urls.defaults import *
+from opal.conf.urls.defaults import *
urlpatterns = patterns('',
- (r'^login/$', 'django.contrib.auth.views.login'),
- (r'^logout/$', 'django.contrib.auth.views.logout'),
- (r'^login_another/$', 'django.contrib.auth.views.logout_then_login'),
+ (r'^login/$', 'opal.contrib.auth.views.login'),
+ (r'^logout/$', 'opal.contrib.auth.views.logout'),
+ (r'^login_another/$', 'opal.contrib.auth.views.logout_then_login'),
(r'^register/$', 'ellington.registration.views.registration.signup'),
(r'^register/(?P<challenge_string>\w{32})/$', 'ellington.registration.views.registration.register_form'),
@@ -12,8 +12,8 @@
(r'^profile/welcome/$', 'ellington.registration.views.profile.profile_welcome'),
(r'^profile/edit/$', 'ellington.registration.views.profile.edit_profile'),
- (r'^password_reset/$', 'django.contrib.auth.views.password_reset'),
- (r'^password_reset/done/$', 'django.contrib.auth.views.password_reset_done'),
- (r'^password_change/$', 'django.contrib.auth.views.password_change'),
- (r'^password_change/done/$', 'django.contrib.auth.views.password_change_done'),
+ (r'^password_reset/$', 'opal.contrib.auth.views.password_reset'),
+ (r'^password_reset/done/$', 'opal.contrib.auth.views.password_reset_done'),
+ (r'^password_change/$', 'opal.contrib.auth.views.password_change'),
+ (r'^password_change/done/$', 'opal.contrib.auth.views.password_change_done'),
)
Modified: cs/pythia/trunk/opal/conf/urls/shortcut.py
===================================================================
--- cs/pythia/trunk/opal/conf/urls/shortcut.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/conf/urls/shortcut.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
-from django.conf.urls.defaults import *
+from opal.conf.urls.defaults import *
-urlpatterns = patterns('django.views',
+urlpatterns = patterns('opal.views',
(r'^(?P<content_type_id>\d+)/(?P<object_id>\d+)/$', 'defaults.shortcut'),
)
Modified: cs/pythia/trunk/opal/contrib/admin/filterspecs.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/filterspecs.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/filterspecs.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -6,7 +6,7 @@
certain test -- e.g. being a DateField or ForeignKey.
"""
-from django.db import models
+from opal.db import models
import datetime
class FilterSpec(object):
Modified: cs/pythia/trunk/opal/contrib/admin/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.db import models
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.auth.models import User
-from django.utils.translation import gettext_lazy as _
+from opal.db import models
+from opal.contrib.contenttypes.models import ContentType
+from opal.contrib.auth.models import User
+from opal.utils.translation import gettext_lazy as _
ADDITION = 1
CHANGE = 2
Modified: cs/pythia/trunk/opal/contrib/admin/templatetags/admin_list.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/templatetags/admin_list.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/templatetags/admin_list.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,13 +1,13 @@
-from django.conf import settings
-from django.contrib.admin.views.main import ALL_VAR, EMPTY_CHANGELIST_VALUE
-from django.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import models
-from django.utils import dateformat
-from django.utils.html import escape
-from django.utils.text import capfirst
-from django.utils.translation import get_date_formats, get_partial_date_formats
-from django.template import Library
+from opal.conf import settings
+from opal.contrib.admin.views.main import ALL_VAR, EMPTY_CHANGELIST_VALUE
+from opal.contrib.admin.views.main import ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR, SEARCH_VAR
+from opal.core.exceptions import ObjectDoesNotExist
+from opal.db import models
+from opal.utils import dateformat
+from opal.utils.html import escape
+from opal.utils.text import capfirst
+from opal.utils.translation import get_date_formats, get_partial_date_formats
+from opal.template import Library
import datetime
register = Library()
Modified: cs/pythia/trunk/opal/contrib/admin/templatetags/admin_modify.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/templatetags/admin_modify.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/templatetags/admin_modify.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,11 +1,11 @@
from django import template
-from django.contrib.admin.views.main import AdminBoundField
-from django.template import loader
-from django.utils.text import capfirst
-from django.db import models
-from django.db.models.fields import Field
-from django.db.models.related import BoundRelatedObject
-from django.conf import settings
+from opal.contrib.admin.views.main import AdminBoundField
+from opal.template import loader
+from opal.utils.text import capfirst
+from opal.db import models
+from opal.db.models.fields import Field
+from opal.db.models.related import BoundRelatedObject
+from opal.conf import settings
import re
register = template.Library()
Modified: cs/pythia/trunk/opal/contrib/admin/templatetags/adminapplist.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/templatetags/adminapplist.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/templatetags/adminapplist.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
from django import template
-from django.db.models import get_models
+from opal.db.models import get_models
register = template.Library()
@@ -8,8 +8,8 @@
self.varname = varname
def render(self, context):
- from django.db import models
- from django.utils.text import capfirst
+ from opal.db import models
+ from opal.utils.text import capfirst
app_list = []
user = context['user']
Modified: cs/pythia/trunk/opal/contrib/admin/templatetags/adminmedia.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/templatetags/adminmedia.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/templatetags/adminmedia.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.template import Library
+from opal.template import Library
register = Library()
@@ -7,7 +7,7 @@
Returns the string contained in the setting ADMIN_MEDIA_PREFIX.
"""
try:
- from django.conf import settings
+ from opal.conf import settings
except ImportError:
return ''
return settings.ADMIN_MEDIA_PREFIX
Modified: cs/pythia/trunk/opal/contrib/admin/templatetags/log.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/templatetags/log.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/templatetags/log.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
from django import template
-from django.contrib.admin.models import LogEntry
+from opal.contrib.admin.models import LogEntry
register = template.Library()
Modified: cs/pythia/trunk/opal/contrib/admin/urls.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/urls.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/urls.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,39 +1,39 @@
-from django.conf import settings
-from django.conf.urls.defaults import *
+from opal.conf import settings
+from opal.conf.urls.defaults import *
if settings.USE_I18N:
- i18n_view = 'django.views.i18n.javascript_catalog'
+ i18n_view = 'opal.views.i18n.javascript_catalog'
else:
- i18n_view = 'django.views.i18n.null_javascript_catalog'
+ i18n_view = 'opal.views.i18n.null_javascript_catalog'
urlpatterns = patterns('',
- ('^$', 'django.contrib.admin.views.main.index'),
- ('^r/(\d+)/(.*)/$', 'django.views.defaults.shortcut'),
- ('^jsi18n/$', i18n_view, {'packages': 'django.conf'}),
- ('^logout/$', 'django.contrib.auth.views.logout'),
- ('^password_change/$', 'django.contrib.auth.views.password_change'),
- ('^password_change/done/$', 'django.contrib.auth.views.password_change_done'),
- ('^template_validator/$', 'django.contrib.admin.views.template.template_validator'),
+ ('^$', 'opal.contrib.admin.views.main.index'),
+ ('^r/(\d+)/(.*)/$', 'opal.views.defaults.shortcut'),
+ ('^jsi18n/$', i18n_view, {'packages': 'opal.conf'}),
+ ('^logout/$', 'opal.contrib.auth.views.logout'),
+ ('^password_change/$', 'opal.contrib.auth.views.password_change'),
+ ('^password_change/done/$', 'opal.contrib.auth.views.password_change_done'),
+ ('^template_validator/$', 'opal.contrib.admin.views.template.template_validator'),
# Documentation
- ('^doc/$', 'django.contrib.admin.views.doc.doc_index'),
- ('^doc/bookmarklets/$', 'django.contrib.admin.views.doc.bookmarklets'),
- ('^doc/tags/$', 'django.contrib.admin.views.doc.template_tag_index'),
- ('^doc/filters/$', 'django.contrib.admin.views.doc.template_filter_index'),
- ('^doc/views/$', 'django.contrib.admin.views.doc.view_index'),
- ('^doc/views/jump/$', 'django.contrib.admin.views.doc.jump_to_view'),
- ('^doc/views/(?P<view>[^/]+)/$', 'django.contrib.admin.views.doc.view_detail'),
- ('^doc/models/$', 'django.contrib.admin.views.doc.model_index'),
- ('^doc/models/(?P<app_label>[^\.]+)\.(?P<model_name>[^/]+)/$', 'django.contrib.admin.views.doc.model_detail'),
-# ('^doc/templates/$', 'django.views.admin.doc.template_index'),
- ('^doc/templates/(?P<template>.*)/$', 'django.contrib.admin.views.doc.template_detail'),
+ ('^doc/$', 'opal.contrib.admin.views.doc.doc_index'),
+ ('^doc/bookmarklets/$', 'opal.contrib.admin.views.doc.bookmarklets'),
+ ('^doc/tags/$', 'opal.contrib.admin.views.doc.template_tag_index'),
+ ('^doc/filters/$', 'opal.contrib.admin.views.doc.template_filter_index'),
+ ('^doc/views/$', 'opal.contrib.admin.views.doc.view_index'),
+ ('^doc/views/jump/$', 'opal.contrib.admin.views.doc.jump_to_view'),
+ ('^doc/views/(?P<view>[^/]+)/$', 'opal.contrib.admin.views.doc.view_detail'),
+ ('^doc/models/$', 'opal.contrib.admin.views.doc.model_index'),
+ ('^doc/models/(?P<app_label>[^\.]+)\.(?P<model_name>[^/]+)/$', 'opal.contrib.admin.views.doc.model_detail'),
+# ('^doc/templates/$', 'opal.views.admin.doc.template_index'),
+ ('^doc/templates/(?P<template>.*)/$', 'opal.contrib.admin.views.doc.template_detail'),
# Add/change/delete/history
- ('^([^/]+)/([^/]+)/$', 'django.contrib.admin.views.main.change_list'),
- ('^([^/]+)/([^/]+)/add/$', 'django.contrib.admin.views.main.add_stage'),
- ('^([^/]+)/([^/]+)/(.+)/history/$', 'django.contrib.admin.views.main.history'),
- ('^([^/]+)/([^/]+)/(.+)/delete/$', 'django.contrib.admin.views.main.delete_stage'),
- ('^([^/]+)/([^/]+)/(.+)/$', 'django.contrib.admin.views.main.change_stage'),
+ ('^([^/]+)/([^/]+)/$', 'opal.contrib.admin.views.main.change_list'),
+ ('^([^/]+)/([^/]+)/add/$', 'opal.contrib.admin.views.main.add_stage'),
+ ('^([^/]+)/([^/]+)/(.+)/history/$', 'opal.contrib.admin.views.main.history'),
+ ('^([^/]+)/([^/]+)/(.+)/delete/$', 'opal.contrib.admin.views.main.delete_stage'),
+ ('^([^/]+)/([^/]+)/(.+)/$', 'opal.contrib.admin.views.main.change_stage'),
)
del i18n_view
Modified: cs/pythia/trunk/opal/contrib/admin/views/decorators.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/views/decorators.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/views/decorators.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,9 +1,9 @@
from django import http, template
-from django.conf import settings
-from django.contrib.auth.models import User
-from django.contrib.auth import authenticate, login
-from django.shortcuts import render_to_response
-from django.utils.translation import gettext_lazy
+from opal.conf import settings
+from opal.contrib.auth.models import User
+from opal.contrib.auth import authenticate, login
+from opal.shortcuts import render_to_response
+from opal.utils.translation import gettext_lazy
import base64, datetime, md5
import cPickle as pickle
@@ -36,7 +36,7 @@
encoded_data = base64.decodestring(encoded_data)
pickled, tamper_check = encoded_data[:-32], encoded_data[-32:]
if md5.new(pickled + settings.SECRET_KEY).hexdigest() != tamper_check:
- from django.core.exceptions import SuspiciousOperation
+ from opal.core.exceptions import SuspiciousOperation
raise SuspiciousOperation, "User may have tampered with session cookie."
return pickle.loads(pickled)
@@ -54,7 +54,7 @@
request.POST = _decode_post_data(request.POST['post_data'])
return view_func(request, *args, **kwargs)
- assert hasattr(request, 'session'), "The Django admin requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+ assert hasattr(request, 'session'), "The Django admin requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'opal.contrib.sessions.middleware.SessionMiddleware'."
# If this isn't already the login page, display it.
if not request.POST.has_key(LOGIN_FORM_KEY):
Modified: cs/pythia/trunk/opal/contrib/admin/views/doc.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/views/doc.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/views/doc.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,14 +1,14 @@
from django import template, templatetags
-from django.template import RequestContext
-from django.conf import settings
-from django.contrib.admin.views.decorators import staff_member_required
-from django.db import models
-from django.shortcuts import render_to_response
-from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
-from django.http import Http404, get_host
-from django.core import urlresolvers
-from django.contrib.admin import utils
-from django.contrib.sites.models import Site
+from opal.template import RequestContext
+from opal.conf import settings
+from opal.contrib.admin.views.decorators import staff_member_required
+from opal.db import models
+from opal.shortcuts import render_to_response
+from opal.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
+from opal.http import Http404, get_host
+from opal.core import urlresolvers
+from opal.contrib.admin import utils
+from opal.contrib.sites.models import Site
import inspect, os, re
# Exclude methods starting with these strings from documentation
@@ -270,7 +270,7 @@
libraries = [os.path.splitext(p)[0] for p in os.listdir(e) if p.endswith('.py') and p[0].isalpha()]
for library_name in libraries:
try:
- lib = template.get_library("django.templatetags.%s" % library_name.split('.')[-1])
+ lib = template.get_library("opal.templatetags.%s" % library_name.split('.')[-1])
except template.InvalidTemplateLibrary:
pass
Modified: cs/pythia/trunk/opal/contrib/admin/views/main.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/views/main.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/views/main.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,25 +1,25 @@
from django import forms, template
-from django.conf import settings
-from django.contrib.admin.filterspecs import FilterSpec
-from django.contrib.admin.views.decorators import staff_member_required
-from django.views.decorators.cache import never_cache
-from django.contrib.contenttypes.models import ContentType
-from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
-from django.core.paginator import ObjectPaginator, InvalidPage
-from django.shortcuts import get_object_or_404, render_to_response
-from django.db import models
-from django.db.models.query import handle_legacy_orderlist, QuerySet
-from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.utils.html import escape
-from django.utils.text import capfirst, get_text_list
+from opal.conf import settings
+from opal.contrib.admin.filterspecs import FilterSpec
+from opal.contrib.admin.views.decorators import staff_member_required
+from opal.views.decorators.cache import never_cache
+from opal.contrib.contenttypes.models import ContentType
+from opal.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist, PermissionDenied
+from opal.core.paginator import ObjectPaginator, InvalidPage
+from opal.shortcuts import get_object_or_404, render_to_response
+from opal.db import models
+from opal.db.models.query import handle_legacy_orderlist, QuerySet
+from opal.http import Http404, HttpResponse, HttpResponseRedirect
+from opal.utils.html import escape
+from opal.utils.text import capfirst, get_text_list
import operator
-from django.contrib.admin.models import LogEntry, ADDITION, CHANGE, DELETION
+from opal.contrib.admin.models import LogEntry, ADDITION, CHANGE, DELETION
if not LogEntry._meta.installed:
- raise ImproperlyConfigured, "You'll need to put 'django.contrib.admin' in your INSTALLED_APPS setting before you can use the admin application."
+ raise ImproperlyConfigured, "You'll need to put 'opal.contrib.admin' in your INSTALLED_APPS setting before you can use the admin application."
-if 'django.core.context_processors.auth' not in settings.TEMPLATE_CONTEXT_PROCESSORS:
- raise ImproperlyConfigured, "You'll need to put 'django.core.context_processors.auth' in your TEMPLATE_CONTEXT_PROCESSORS setting before you can use the admin application."
+if 'opal.core.context_processors.auth' not in settings.TEMPLATE_CONTEXT_PROCESSORS:
+ raise ImproperlyConfigured, "You'll need to put 'opal.core.context_processors.auth' in your TEMPLATE_CONTEXT_PROCESSORS setting before you can use the admin application."
# The system will display a "Show all" link on the change list only if the
# total result count is less than or equal to this setting.
Modified: cs/pythia/trunk/opal/contrib/admin/views/template.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/views/template.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/admin/views/template.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,10 +1,10 @@
-from django.contrib.admin.views.decorators import staff_member_required
-from django.core import validators
+from opal.contrib.admin.views.decorators import staff_member_required
+from opal.core import validators
from django import template, forms
-from django.template import loader
-from django.shortcuts import render_to_response
-from django.contrib.sites.models import Site
-from django.conf import settings
+from opal.template import loader
+from opal.shortcuts import render_to_response
+from opal.contrib.sites.models import Site
+from opal.conf import settings
def template_validator(request):
"""
Modified: cs/pythia/trunk/opal/contrib/auth/__init__.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.core.exceptions import ImproperlyConfigured
+from opal.core.exceptions import ImproperlyConfigured
SESSION_KEY = '_auth_user_id'
BACKEND_SESSION_KEY = '_auth_user_backend'
@@ -19,7 +19,7 @@
return cls()
def get_backends():
- from django.conf import settings
+ from opal.conf import settings
backends = []
for backend_path in settings.AUTHENTICATION_BACKENDS:
backends.append(load_backend(backend_path))
@@ -66,7 +66,7 @@
pass
def get_user(request):
- from django.contrib.auth.models import AnonymousUser
+ from opal.contrib.auth.models import AnonymousUser
try:
user_id = request.session[SESSION_KEY]
backend_path = request.session[BACKEND_SESSION_KEY]
Modified: cs/pythia/trunk/opal/contrib/auth/backends.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/backends.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/backends.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-from django.contrib.auth.models import User
+from opal.contrib.auth.models import User
class ModelBackend:
"""
- Authenticate against django.contrib.auth.models.User
+ Authenticate against opal.contrib.auth.models.User
"""
# TODO: Model, login attribute name and password attribute name should be
# configurable.
Modified: cs/pythia/trunk/opal/contrib/auth/create_superuser.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/create_superuser.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/create_superuser.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -5,8 +5,8 @@
interactively.
"""
-from django.core import validators
-from django.contrib.auth.models import User
+from opal.core import validators
+from opal.contrib.auth.models import User
import getpass
import os
import sys
Modified: cs/pythia/trunk/opal/contrib/auth/decorators.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/decorators.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/decorators.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
-from django.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME
-from django.http import HttpResponseRedirect
+from opal.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME
+from opal.http import HttpResponseRedirect
from urllib import quote
def user_passes_test(test_func, login_url=LOGIN_URL):
Modified: cs/pythia/trunk/opal/contrib/auth/forms.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/forms.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/forms.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-from django.contrib.auth.models import User
-from django.contrib.auth import authenticate
-from django.contrib.sites.models import Site
-from django.template import Context, loader
-from django.core import validators
+from opal.contrib.auth.models import User
+from opal.contrib.auth import authenticate
+from opal.contrib.sites.models import Site
+from opal.template import Context, loader
+from opal.core import validators
from django import forms
class AuthenticationForm(forms.Manipulator):
@@ -63,7 +63,7 @@
def save(self, domain_override=None, email_template_name='registration/password_reset_email.html'):
"Calculates a new password randomly and sends it to the user"
- from django.core.mail import send_mail
+ from opal.core.mail import send_mail
new_pass = User.objects.make_random_password()
self.user_cache.set_password(new_pass)
self.user_cache.save()
Modified: cs/pythia/trunk/opal/contrib/auth/handlers/modpython.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/handlers/modpython.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/handlers/modpython.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -21,7 +21,7 @@
if settings_module:
os.environ['DJANGO_SETTINGS_MODULE'] = settings_module
- from django.contrib.auth.models import User
+ from opal.contrib.auth.models import User
# check that the username is valid
kwargs = {'username': req.user, 'is_active': True}
Modified: cs/pythia/trunk/opal/contrib/auth/management.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/management.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/management.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,9 +2,9 @@
Creates permissions for all installed apps that need permissions.
"""
-from django.dispatch import dispatcher
-from django.db.models import get_models, signals
-from django.contrib.auth import models as auth_app
+from opal.dispatch import dispatcher
+from opal.db.models import get_models, signals
+from opal.contrib.auth import models as auth_app
def _get_permission_codename(action, opts):
return '%s_%s' % (action, opts.object_name.lower())
@@ -17,8 +17,8 @@
return perms + list(opts.permissions)
def create_permissions(app, created_models):
- from django.contrib.contenttypes.models import ContentType
- from django.contrib.auth.models import Permission
+ from opal.contrib.contenttypes.models import ContentType
+ from opal.contrib.auth.models import Permission
app_models = get_models(app)
if not app_models:
return
@@ -31,8 +31,8 @@
print "Adding permission '%s'" % p
def create_superuser(app, created_models):
- from django.contrib.auth.models import User
- from django.contrib.auth.create_superuser import createsuperuser as do_create
+ from opal.contrib.auth.models import User
+ from opal.contrib.auth.create_superuser import createsuperuser as do_create
if User in created_models:
msg = "\nYou just installed Django's auth system, which means you don't have " \
"any superusers defined.\nWould you like to create one now? (yes/no): "
Modified: cs/pythia/trunk/opal/contrib/auth/middleware.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/middleware.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/middleware.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,12 +1,12 @@
class LazyUser(object):
def __get__(self, request, obj_type=None):
if not hasattr(request, '_cached_user'):
- from django.contrib.auth import get_user
+ from opal.contrib.auth import get_user
request._cached_user = get_user(request)
return request._cached_user
class AuthenticationMiddleware(object):
def process_request(self, request):
- assert hasattr(request, 'session'), "The Django authentication middleware requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
+ assert hasattr(request, 'session'), "The Django authentication middleware requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'opal.contrib.sessions.middleware.SessionMiddleware'."
request.__class__.user = LazyUser()
return None
Modified: cs/pythia/trunk/opal/contrib/auth/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-from django.core import validators
-from django.core.exceptions import ImproperlyConfigured
-from django.db import backend, connection, models
-from django.contrib.contenttypes.models import ContentType
-from django.utils.translation import gettext_lazy as _
+from opal.core import validators
+from opal.core.exceptions import ImproperlyConfigured
+from opal.db import backend, connection, models
+from opal.contrib.contenttypes.models import ContentType
+from opal.utils.translation import gettext_lazy as _
import datetime
def check_password(raw_password, enc_password):
@@ -229,7 +229,7 @@
def email_user(self, subject, message, from_email=None):
"Sends an e-mail to this User."
- from django.core.mail import send_mail
+ from opal.core.mail import send_mail
send_mail(subject, message, from_email, [self.email])
def get_profile(self):
@@ -238,7 +238,7 @@
SiteProfileNotAvailable if this site does not allow profiles.
"""
if not hasattr(self, '_profile_cache'):
- from django.conf import settings
+ from opal.conf import settings
if not settings.AUTH_PROFILE_MODULE:
raise SiteProfileNotAvailable
try:
Modified: cs/pythia/trunk/opal/contrib/auth/views.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/views.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/auth/views.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,12 +1,12 @@
-from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth.forms import PasswordResetForm, PasswordChangeForm
+from opal.contrib.auth.forms import AuthenticationForm
+from opal.contrib.auth.forms import PasswordResetForm, PasswordChangeForm
from django import forms
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-from django.contrib.sites.models import Site
-from django.http import HttpResponseRedirect
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME
+from opal.shortcuts import render_to_response
+from opal.template import RequestContext
+from opal.contrib.sites.models import Site
+from opal.http import HttpResponseRedirect
+from opal.contrib.auth.decorators import login_required
+from opal.contrib.auth import LOGIN_URL, REDIRECT_FIELD_NAME
def login(request, template_name='registration/login.html'):
"Displays the login form and handles the login action."
@@ -18,7 +18,7 @@
# Light security check -- make sure redirect_to isn't garbage.
if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
redirect_to = '/accounts/profile/'
- from django.contrib.auth import login
+ from opal.contrib.auth import login
login(request, manipulator.get_user())
request.session.delete_test_cookie()
return HttpResponseRedirect(redirect_to)
@@ -33,7 +33,7 @@
def logout(request, next_page=None, template_name='registration/logged_out.html'):
"Logs out the user and displays 'You are logged out' message."
- from django.contrib.auth import logout
+ from opal.contrib.auth import logout
logout(request)
if next_page is None:
return render_to_response(template_name, {'title': _('Logged out')}, context_instance=RequestContext(request))
Modified: cs/pythia/trunk/opal/contrib/comments/feeds.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/feeds.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/comments/feeds.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.conf import settings
-from django.contrib.comments.models import Comment, FreeComment
-from django.contrib.syndication.feeds import Feed
-from django.contrib.sites.models import Site
+from opal.conf import settings
+from opal.contrib.comments.models import Comment, FreeComment
+from opal.contrib.syndication.feeds import Feed
+from opal.contrib.sites.models import Site
class LatestFreeCommentsFeed(Feed):
"Feed of latest comments on the current site."
Modified: cs/pythia/trunk/opal/contrib/comments/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/comments/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,9 +1,9 @@
-from django.db import models
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.sites.models import Site
-from django.contrib.auth.models import User
-from django.utils.translation import gettext_lazy as _
-from django.conf import settings
+from opal.db import models
+from opal.contrib.contenttypes.models import ContentType
+from opal.contrib.sites.models import Site
+from opal.contrib.auth.models import User
+from opal.utils.translation import gettext_lazy as _
+from opal.conf import settings
import datetime
MIN_PHOTO_DIMENSION = 5
@@ -122,7 +122,7 @@
Returns the object that this comment is a comment on. Returns None if
the object no longer exists.
"""
- from django.core.exceptions import ObjectDoesNotExist
+ from opal.core.exceptions import ObjectDoesNotExist
try:
return self.content_type.get_object_for_this_type(pk=self.object_id)
except ObjectDoesNotExist:
@@ -198,7 +198,7 @@
Returns the object that this comment is a comment on. Returns None if
the object no longer exists.
"""
- from django.core.exceptions import ObjectDoesNotExist
+ from opal.core.exceptions import ObjectDoesNotExist
try:
return self.content_type.get_object_for_this_type(pk=self.object_id)
except ObjectDoesNotExist:
@@ -253,7 +253,7 @@
try:
f = self.objects.get(user__pk=user.id, comment__pk=comment.id)
except self.model.DoesNotExist:
- from django.core.mail import mail_managers
+ from opal.core.mail import mail_managers
f = self.model(None, user.id, comment.id, None)
message = _('This comment was flagged by %(user)s:\n\n%(text)s') % {'user': user.username, 'text': comment.get_as_text()}
mail_managers('Comment flagged', message, fail_silently=True)
Modified: cs/pythia/trunk/opal/contrib/comments/templatetags/comments.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/templatetags/comments.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/comments/templatetags/comments.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,10 +1,10 @@
-from django.contrib.comments.models import Comment, FreeComment
-from django.contrib.comments.models import PHOTOS_REQUIRED, PHOTOS_OPTIONAL, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC
-from django.contrib.comments.models import MIN_PHOTO_DIMENSION, MAX_PHOTO_DIMENSION
+from opal.contrib.comments.models import Comment, FreeComment
+from opal.contrib.comments.models import PHOTOS_REQUIRED, PHOTOS_OPTIONAL, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC
+from opal.contrib.comments.models import MIN_PHOTO_DIMENSION, MAX_PHOTO_DIMENSION
from django import template
-from django.template import loader
-from django.core.exceptions import ObjectDoesNotExist
-from django.contrib.contenttypes.models import ContentType
+from opal.template import loader
+from opal.core.exceptions import ObjectDoesNotExist
+from opal.contrib.contenttypes.models import ContentType
import re
register = template.Library()
@@ -25,7 +25,7 @@
self.is_public = is_public
def render(self, context):
- from django.utils.text import normalize_newlines
+ from opal.utils.text import normalize_newlines
import base64
context.push()
if self.obj_id_lookup_var is not None:
@@ -76,7 +76,7 @@
self.var_name, self.free = var_name, free
def render(self, context):
- from django.conf import settings
+ from opal.conf import settings
manager = self.free and FreeComment.objects or Comment.objects
if self.context_var_name is not None:
self.obj_id = template.resolve_variable(self.context_var_name, context)
@@ -95,7 +95,7 @@
self.extra_kwargs = extra_kwargs or {}
def render(self, context):
- from django.conf import settings
+ from opal.conf import settings
get_list_function = self.free and FreeComment.objects.filter or Comment.objects.get_list_with_karma
if self.context_var_name is not None:
try:
Modified: cs/pythia/trunk/opal/contrib/comments/urls/comments.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/urls/comments.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/comments/urls/comments.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.conf.urls.defaults import *
+from opal.conf.urls.defaults import *
-urlpatterns = patterns('django.contrib.comments.views',
+urlpatterns = patterns('opal.contrib.comments.views',
(r'^post/$', 'comments.post_comment'),
(r'^postfree/$', 'comments.post_free_comment'),
(r'^posted/$', 'comments.comment_was_posted'),
Modified: cs/pythia/trunk/opal/contrib/comments/views/comments.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/views/comments.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/comments/views/comments.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,17 +1,17 @@
-from django.core import validators
+from opal.core import validators
from django import forms
-from django.core.mail import mail_admins, mail_managers
-from django.http import Http404
-from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-from django.contrib.comments.models import Comment, FreeComment, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.auth.forms import AuthenticationForm
-from django.http import HttpResponseRedirect
-from django.utils.text import normalize_newlines
-from django.conf import settings
-from django.utils.translation import ngettext
+from opal.core.mail import mail_admins, mail_managers
+from opal.http import Http404
+from opal.core.exceptions import ObjectDoesNotExist
+from opal.shortcuts import render_to_response
+from opal.template import RequestContext
+from opal.contrib.comments.models import Comment, FreeComment, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC
+from opal.contrib.contenttypes.models import ContentType
+from opal.contrib.auth.forms import AuthenticationForm
+from opal.http import HttpResponseRedirect
+from opal.utils.text import normalize_newlines
+from opal.conf import settings
+from opal.utils.translation import ngettext
import base64, datetime
COMMENTS_PER_PAGE = 20
@@ -218,7 +218,7 @@
# If user gave correct username/password and wasn't already logged in, log them in
# so they don't have to enter a username/password again.
if manipulator.get_user() and new_data.has_key('password') and manipulator.get_user().check_password(new_data['password']):
- from django.contrib.auth import login
+ from opal.contrib.auth import login
login(request, manipulator.get_user())
if errors or request.POST.has_key('preview'):
class CommentFormWrapper(forms.FormWrapper):
@@ -311,7 +311,7 @@
# If the IP is banned, mail the admins, do NOT save the comment, and
# serve up the "Thanks for posting" page as if the comment WAS posted.
if request.META['REMOTE_ADDR'] in settings.BANNED_IPS:
- from django.core.mail import mail_admins
+ from opal.core.mail import mail_admins
mail_admins("Practical joker", str(request.POST) + "\n\n" + str(request.META))
else:
manipulator.do_html2python(new_data)
Modified: cs/pythia/trunk/opal/contrib/comments/views/karma.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/views/karma.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/comments/views/karma.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.http import Http404
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-from django.contrib.comments.models import Comment, KarmaScore
+from opal.http import Http404
+from opal.shortcuts import render_to_response
+from opal.template import RequestContext
+from opal.contrib.comments.models import Comment, KarmaScore
def vote(request, comment_id, vote):
"""
Modified: cs/pythia/trunk/opal/contrib/comments/views/userflags.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/views/userflags.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/comments/views/userflags.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,10 +1,10 @@
-from django.shortcuts import render_to_response, get_object_or_404
-from django.template import RequestContext
-from django.http import Http404
-from django.contrib.comments.models import Comment, ModeratorDeletion, UserFlag
-from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseRedirect
-from django.conf import settings
+from opal.shortcuts import render_to_response, get_object_or_404
+from opal.template import RequestContext
+from opal.http import Http404
+from opal.contrib.comments.models import Comment, ModeratorDeletion, UserFlag
+from opal.contrib.auth.decorators import login_required
+from opal.http import HttpResponseRedirect
+from opal.conf import settings
def flag(request, comment_id):
"""
Modified: cs/pythia/trunk/opal/contrib/contenttypes/management.py
===================================================================
--- cs/pythia/trunk/opal/contrib/contenttypes/management.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/contenttypes/management.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,11 +2,11 @@
Creates content types for all installed models.
"""
-from django.dispatch import dispatcher
-from django.db.models import get_models, signals
+from opal.dispatch import dispatcher
+from opal.db.models import get_models, signals
def create_contenttypes(app, created_models):
- from django.contrib.contenttypes.models import ContentType
+ from opal.contrib.contenttypes.models import ContentType
app_models = get_models(app)
if not app_models:
return
Modified: cs/pythia/trunk/opal/contrib/contenttypes/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/contenttypes/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/contenttypes/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
+from opal.db import models
+from opal.utils.translation import gettext_lazy as _
class ContentTypeManager(models.Manager):
def get_for_model(self, model):
@@ -9,7 +9,7 @@
"""
opts = model._meta
# The str() is needed around opts.verbose_name because it's a
- # django.utils.functional.__proxy__ object.
+ # opal.utils.functional.__proxy__ object.
ct, created = self.model._default_manager.get_or_create(app_label=opts.app_label,
model=opts.object_name.lower(), defaults={'name': str(opts.verbose_name)})
return ct
@@ -31,7 +31,7 @@
def model_class(self):
"Returns the Python model class for this type of content."
- from django.db import models
+ from opal.db import models
return models.get_model(self.app_label, self.model)
def get_object_for_this_type(self, **kwargs):
Modified: cs/pythia/trunk/opal/contrib/csrf/middleware.py
===================================================================
--- cs/pythia/trunk/opal/contrib/csrf/middleware.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/csrf/middleware.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -5,8 +5,8 @@
against request forgeries from other sites.
"""
-from django.conf import settings
-from django.http import HttpResponseForbidden
+from opal.conf import settings
+from opal.http import HttpResponseForbidden
import md5
import re
import itertools
Modified: cs/pythia/trunk/opal/contrib/flatpages/middleware.py
===================================================================
--- cs/pythia/trunk/opal/contrib/flatpages/middleware.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/flatpages/middleware.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.contrib.flatpages.views import flatpage
-from django.http import Http404
-from django.conf import settings
+from opal.contrib.flatpages.views import flatpage
+from opal.http import Http404
+from opal.conf import settings
class FlatpageFallbackMiddleware(object):
def process_response(self, request, response):
Modified: cs/pythia/trunk/opal/contrib/flatpages/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/flatpages/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/flatpages/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.core import validators
-from django.db import models
-from django.contrib.sites.models import Site
-from django.utils.translation import gettext_lazy as _
+from opal.core import validators
+from opal.db import models
+from opal.contrib.sites.models import Site
+from opal.utils.translation import gettext_lazy as _
class FlatPage(models.Model):
url = models.CharField(_('URL'), maxlength=100, validator_list=[validators.isAlphaNumericURL],
Modified: cs/pythia/trunk/opal/contrib/flatpages/urls.py
===================================================================
--- cs/pythia/trunk/opal/contrib/flatpages/urls.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/flatpages/urls.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
-from django.conf.urls.defaults import *
+from opal.conf.urls.defaults import *
-urlpatterns = patterns('django.contrib.flatpages.views',
+urlpatterns = patterns('opal.contrib.flatpages.views',
(r'^(?P<url>.*)$', 'flatpage'),
)
Modified: cs/pythia/trunk/opal/contrib/flatpages/views.py
===================================================================
--- cs/pythia/trunk/opal/contrib/flatpages/views.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/flatpages/views.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-from django.contrib.flatpages.models import FlatPage
-from django.template import loader, RequestContext
-from django.shortcuts import get_object_or_404
-from django.http import HttpResponse
-from django.conf import settings
+from opal.contrib.flatpages.models import FlatPage
+from opal.template import loader, RequestContext
+from opal.shortcuts import get_object_or_404
+from opal.http import HttpResponse
+from opal.conf import settings
DEFAULT_TEMPLATE = 'flatpages/default.html'
@@ -23,7 +23,7 @@
# If registration is required for accessing this page, and the user isn't
# logged in, redirect to the login page.
if f.registration_required and not request.user.is_authenticated():
- from django.contrib.auth.views import redirect_to_login
+ from opal.contrib.auth.views import redirect_to_login
return redirect_to_login(request.path)
if f.template_name:
t = loader.select_template((f.template_name, DEFAULT_TEMPLATE))
Modified: cs/pythia/trunk/opal/contrib/markup/templatetags/markup.py
===================================================================
--- cs/pythia/trunk/opal/contrib/markup/templatetags/markup.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/markup/templatetags/markup.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -15,7 +15,7 @@
"""
from django import template
-from django.conf import settings
+from opal.conf import settings
register = template.Library()
Modified: cs/pythia/trunk/opal/contrib/redirects/middleware.py
===================================================================
--- cs/pythia/trunk/opal/contrib/redirects/middleware.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/redirects/middleware.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.contrib.redirects.models import Redirect
+from opal.contrib.redirects.models import Redirect
from django import http
-from django.conf import settings
+from opal.conf import settings
class RedirectFallbackMiddleware(object):
def process_response(self, request, response):
Modified: cs/pythia/trunk/opal/contrib/redirects/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/redirects/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/redirects/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.db import models
-from django.contrib.sites.models import Site
-from django.utils.translation import gettext_lazy as _
+from opal.db import models
+from opal.contrib.sites.models import Site
+from opal.utils.translation import gettext_lazy as _
class Redirect(models.Model):
site = models.ForeignKey(Site, radio_admin=models.VERTICAL)
Modified: cs/pythia/trunk/opal/contrib/sessions/middleware.py
===================================================================
--- cs/pythia/trunk/opal/contrib/sessions/middleware.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/sessions/middleware.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.conf import settings
-from django.contrib.sessions.models import Session
-from django.utils.cache import patch_vary_headers
+from opal.conf import settings
+from opal.contrib.sessions.models import Session
+from opal.utils.cache import patch_vary_headers
import datetime
TEST_COOKIE_NAME = 'testcookie'
Modified: cs/pythia/trunk/opal/contrib/sessions/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/sessions/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/sessions/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
import base64, md5, random, sys
import cPickle as pickle
-from django.db import models
-from django.utils.translation import gettext_lazy as _
-from django.conf import settings
+from opal.db import models
+from opal.utils.translation import gettext_lazy as _
+from opal.conf import settings
class SessionManager(models.Manager):
def encode(self, session_dict):
@@ -61,7 +61,7 @@
encoded_data = base64.decodestring(self.session_data)
pickled, tamper_check = encoded_data[:-32], encoded_data[-32:]
if md5.new(pickled + settings.SECRET_KEY).hexdigest() != tamper_check:
- from django.core.exceptions import SuspiciousOperation
+ from opal.core.exceptions import SuspiciousOperation
raise SuspiciousOperation, "User tampered with session cookie."
try:
return pickle.loads(pickled)
Modified: cs/pythia/trunk/opal/contrib/sites/management.py
===================================================================
--- cs/pythia/trunk/opal/contrib/sites/management.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/sites/management.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,10 +2,10 @@
Creates the default Site object.
"""
-from django.dispatch import dispatcher
-from django.db.models import signals
-from django.contrib.sites.models import Site
-from django.contrib.sites import models as site_app
+from opal.dispatch import dispatcher
+from opal.db.models import signals
+from opal.contrib.sites.models import Site
+from opal.contrib.sites import models as site_app
def create_default_site(app, created_models):
if Site in created_models:
Modified: cs/pythia/trunk/opal/contrib/sites/managers.py
===================================================================
--- cs/pythia/trunk/opal/contrib/sites/managers.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/sites/managers.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.conf import settings
-from django.db import models
-from django.db.models.fields import FieldDoesNotExist
+from opal.conf import settings
+from opal.db import models
+from opal.db.models.fields import FieldDoesNotExist
class CurrentSiteManager(models.Manager):
"Use this to limit objects to those associated with the current site."
Modified: cs/pythia/trunk/opal/contrib/sites/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/sites/models.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/sites/models.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,9 +1,9 @@
-from django.db import models
-from django.utils.translation import gettext_lazy as _
+from opal.db import models
+from opal.utils.translation import gettext_lazy as _
class SiteManager(models.Manager):
def get_current(self):
- from django.conf import settings
+ from opal.conf import settings
return self.get(pk=settings.SITE_ID)
class Site(models.Model):
Modified: cs/pythia/trunk/opal/contrib/syndication/feeds.py
===================================================================
--- cs/pythia/trunk/opal/contrib/syndication/feeds.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/syndication/feeds.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
-from django.template import Context, loader, Template, TemplateDoesNotExist
-from django.contrib.sites.models import Site
-from django.utils import feedgenerator
-from django.conf import settings
+from opal.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
+from opal.template import Context, loader, Template, TemplateDoesNotExist
+from opal.contrib.sites.models import Site
+from opal.utils import feedgenerator
+from opal.conf import settings
def add_domain(domain, url):
if not url.startswith('http://'):
Modified: cs/pythia/trunk/opal/contrib/syndication/views.py
===================================================================
--- cs/pythia/trunk/opal/contrib/syndication/views.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/contrib/syndication/views.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
-from django.contrib.syndication import feeds
-from django.http import HttpResponse, Http404
+from opal.contrib.syndication import feeds
+from opal.http import HttpResponse, Http404
def feed(request, url, feed_dict=None):
if not feed_dict:
Modified: cs/pythia/trunk/opal/core/cache/__init__.py
===================================================================
--- cs/pythia/trunk/opal/core/cache/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/cache/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -4,7 +4,7 @@
This package defines set of cache backends that all conform to a simple API.
In a nutshell, a cache is a set of values -- which can be any object that
may be pickled -- identified by string keys. For the complete API, see
-the abstract BaseCache class in django.core.cache.backends.base.
+the abstract BaseCache class in opal.core.cache.backends.base.
Client code should not access a cache backend directly; instead it should
either use the "cache" variable made available here, or it should use the
@@ -16,8 +16,8 @@
"""
from cgi import parse_qsl
-from django.conf import settings
-from django.core.cache.backends.base import InvalidCacheBackendError
+from opal.conf import settings
+from opal.core.cache.backends.base import InvalidCacheBackendError
BACKENDS = {
# name for use in settings file --> name of module in "backends" directory
@@ -48,7 +48,7 @@
if host.endswith('/'):
host = host[:-1]
- cache_class = getattr(__import__('django.core.cache.backends.%s' % BACKENDS[scheme], '', '', ['']), 'CacheClass')
+ cache_class = getattr(__import__('opal.core.cache.backends.%s' % BACKENDS[scheme], '', '', ['']), 'CacheClass')
return cache_class(host, params)
cache = get_cache(settings.CACHE_BACKEND)
Modified: cs/pythia/trunk/opal/core/cache/backends/base.py
===================================================================
--- cs/pythia/trunk/opal/core/cache/backends/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/cache/backends/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"Base Cache class."
-from django.core.exceptions import ImproperlyConfigured
+from opal.core.exceptions import ImproperlyConfigured
class InvalidCacheBackendError(ImproperlyConfigured):
pass
Modified: cs/pythia/trunk/opal/core/cache/backends/db.py
===================================================================
--- cs/pythia/trunk/opal/core/cache/backends/db.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/cache/backends/db.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
"Database cache backend."
-from django.core.cache.backends.base import BaseCache
-from django.db import connection, transaction, DatabaseError
+from opal.core.cache.backends.base import BaseCache
+from opal.db import connection, transaction, DatabaseError
import base64, time
from datetime import datetime
try:
Modified: cs/pythia/trunk/opal/core/cache/backends/dummy.py
===================================================================
--- cs/pythia/trunk/opal/core/cache/backends/dummy.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/cache/backends/dummy.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"Dummy cache backend"
-from django.core.cache.backends.base import BaseCache
+from opal.core.cache.backends.base import BaseCache
class CacheClass(BaseCache):
def __init__(self, *args, **kwargs):
Modified: cs/pythia/trunk/opal/core/cache/backends/filebased.py
===================================================================
--- cs/pythia/trunk/opal/core/cache/backends/filebased.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/cache/backends/filebased.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"File-based cache backend"
-from django.core.cache.backends.simple import CacheClass as SimpleCacheClass
+from opal.core.cache.backends.simple import CacheClass as SimpleCacheClass
import os, time, urllib
try:
import cPickle as pickle
Modified: cs/pythia/trunk/opal/core/cache/backends/locmem.py
===================================================================
--- cs/pythia/trunk/opal/core/cache/backends/locmem.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/cache/backends/locmem.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
"Thread-safe in-memory cache backend."
-from django.core.cache.backends.simple import CacheClass as SimpleCacheClass
-from django.utils.synch import RWLock
+from opal.core.cache.backends.simple import CacheClass as SimpleCacheClass
+from opal.utils.synch import RWLock
import copy, time
class CacheClass(SimpleCacheClass):
Modified: cs/pythia/trunk/opal/core/cache/backends/memcached.py
===================================================================
--- cs/pythia/trunk/opal/core/cache/backends/memcached.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/cache/backends/memcached.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"Memcached cache backend"
-from django.core.cache.backends.base import BaseCache, InvalidCacheBackendError
+from opal.core.cache.backends.base import BaseCache, InvalidCacheBackendError
try:
import memcache
Modified: cs/pythia/trunk/opal/core/cache/backends/simple.py
===================================================================
--- cs/pythia/trunk/opal/core/cache/backends/simple.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/cache/backends/simple.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"Single-process in-memory cache backend."
-from django.core.cache.backends.base import BaseCache
+from opal.core.cache.backends.base import BaseCache
import time
class CacheClass(BaseCache):
Modified: cs/pythia/trunk/opal/core/context_processors.py
===================================================================
--- cs/pythia/trunk/opal/core/context_processors.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/context_processors.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -7,7 +7,7 @@
RequestContext.
"""
-from django.conf import settings
+from opal.conf import settings
def auth(request):
"""
@@ -25,7 +25,7 @@
context_extras = {}
if settings.DEBUG and request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS:
context_extras['debug'] = True
- from django.db import connection
+ from opal.db import connection
context_extras['sql_queries'] = connection.queries
return context_extras
@@ -37,7 +37,7 @@
else:
context_extras['LANGUAGE_CODE'] = settings.LANGUAGE_CODE
- from django.utils import translation
+ from opal.utils import translation
context_extras['LANGUAGE_BIDI'] = translation.get_language_bidi()
return context_extras
Modified: cs/pythia/trunk/opal/core/handler.py
===================================================================
--- cs/pythia/trunk/opal/core/handler.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/handler.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,11 +1,11 @@
# This module is DEPRECATED!
#
# You should no longer be pointing your mod_python configuration
-# at "django.core.handler".
+# at "opal.core.handler".
#
-# Use "django.core.handlers.modpython" instead.
+# Use "opal.core.handlers.modpython" instead.
-from django.core.handlers.modpython import ModPythonHandler
+from opal.core.handlers.modpython import ModPythonHandler
def handler(req):
return ModPythonHandler()(req)
Modified: cs/pythia/trunk/opal/core/handlers/base.py
===================================================================
--- cs/pythia/trunk/opal/core/handlers/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/handlers/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
-from django.core import signals
-from django.dispatch import dispatcher
+from opal.core import signals
+from opal.dispatch import dispatcher
from django import http
import sys
@@ -13,8 +13,8 @@
Must be called after the environment is fixed (see __call__).
"""
- from django.conf import settings
- from django.core import exceptions
+ from opal.conf import settings
+ from opal.core import exceptions
self._request_middleware = []
self._view_middleware = []
self._response_middleware = []
@@ -50,9 +50,9 @@
def get_response(self, path, request):
"Returns an HttpResponse object for the given HttpRequest"
- from django.core import exceptions, urlresolvers
- from django.core.mail import mail_admins
- from django.conf import settings
+ from opal.core import exceptions, urlresolvers
+ from opal.core.mail import mail_admins
+ from opal.conf import settings
# Apply request middleware
for middleware_method in self._request_middleware:
@@ -127,7 +127,7 @@
Returns an HttpResponse that displays a TECHNICAL error message for a
fundamental error.
"""
- from django.views import debug
+ from opal.views import debug
if is404:
return debug.technical_404_response(request, exception)
else:
Modified: cs/pythia/trunk/opal/core/handlers/modpython.py
===================================================================
--- cs/pythia/trunk/opal/core/handlers/modpython.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/handlers/modpython.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.core.handlers.base import BaseHandler
-from django.core import signals
-from django.dispatch import dispatcher
-from django.utils import datastructures
+from opal.core.handlers.base import BaseHandler
+from opal.core import signals
+from opal.dispatch import dispatcher
+from opal.utils import datastructures
from django import http
from pprint import pformat
import os
@@ -120,7 +120,7 @@
# now that the environ works we can see the correct settings, so imports
# that use settings now can work
- from django.conf import settings
+ from opal.conf import settings
if settings.ENABLE_PSYCO:
import psyco
Modified: cs/pythia/trunk/opal/core/handlers/profiler-hotshot.py
===================================================================
--- cs/pythia/trunk/opal/core/handlers/profiler-hotshot.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/handlers/profiler-hotshot.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
import hotshot, time, os
-from django.core.handlers.modpython import ModPythonHandler
+from opal.core.handlers.modpython import ModPythonHandler
PROFILE_DATA_DIR = "/var/log/cmsprofile"
Modified: cs/pythia/trunk/opal/core/handlers/wsgi.py
===================================================================
--- cs/pythia/trunk/opal/core/handlers/wsgi.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/handlers/wsgi.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.core.handlers.base import BaseHandler
-from django.core import signals
-from django.dispatch import dispatcher
-from django.utils import datastructures
+from opal.core.handlers.base import BaseHandler
+from opal.core import signals
+from opal.dispatch import dispatcher
+from opal.utils import datastructures
from django import http
from pprint import pformat
@@ -131,7 +131,7 @@
class WSGIHandler(BaseHandler):
def __call__(self, environ, start_response):
- from django.conf import settings
+ from opal.conf import settings
if settings.ENABLE_PSYCO:
import psyco
Modified: cs/pythia/trunk/opal/core/mail.py
===================================================================
--- cs/pythia/trunk/opal/core/mail.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/mail.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
# Use this module for e-mailing.
-from django.conf import settings
+from opal.conf import settings
from email.MIMEText import MIMEText
from email.Header import Header
import smtplib, rfc822
Modified: cs/pythia/trunk/opal/core/management.py
===================================================================
--- cs/pythia/trunk/opal/core/management.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/management.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,10 +2,10 @@
# development-server initialization.
import django
-from django.core.exceptions import ImproperlyConfigured
+from opal.core.exceptions import ImproperlyConfigured
import os, re, shutil, sys, textwrap
from optparse import OptionParser
-from django.utils import termcolors
+from opal.utils import termcolors
# For Python 2.3
if not hasattr(__builtins__, 'set'):
@@ -21,9 +21,9 @@
APP_ARGS = '[appname ...]'
-# Use django.__path__[0] because we don't know which directory django into
+# Use opal.__path__[0] because we don't know which directory django into
# which has been installed.
-PROJECT_TEMPLATE_DIR = os.path.join(django.__path__[0], 'conf', '%s_template')
+PROJECT_TEMPLATE_DIR = os.path.join(opal.__path__[0], 'conf', '%s_template')
INVALID_PROJECT_NAMES = ('django', 'test')
@@ -54,7 +54,7 @@
def _get_installed_models(table_list):
"Gets a set of all models that are installed, given a list of existing tables"
- from django.db import models
+ from opal.db import models
all_models = []
for app in models.get_apps():
for model in models.get_models(app):
@@ -63,7 +63,7 @@
def _get_table_list():
"Gets a list of all db tables that are physically installed."
- from django.db import connection, get_introspection_module
+ from opal.db import connection, get_introspection_module
cursor = connection.cursor()
return get_introspection_module().get_table_list(cursor)
@@ -83,7 +83,7 @@
def get_sql_create(app):
"Returns a list of the CREATE TABLE SQL statements for the given app."
- from django.db import get_creation_module, models
+ from opal.db import get_creation_module, models
data_types = get_creation_module().DATA_TYPES
if not data_types:
@@ -133,7 +133,7 @@
Returns list_of_sql, pending_references_dict
"""
- from django.db import backend, get_creation_module, models
+ from opal.db import backend, get_creation_module, models
data_types = get_creation_module().DATA_TYPES
opts = model._meta
@@ -188,7 +188,7 @@
"""
Get any ALTER TABLE statements to add constraints after the fact.
"""
- from django.db import backend, get_creation_module
+ from opal.db import backend, get_creation_module
data_types = get_creation_module().DATA_TYPES
final_output = []
@@ -215,8 +215,8 @@
return final_output
def _get_many_to_many_sql_for_model(model):
- from django.db import backend, get_creation_module
- from django.db.models import GenericRel
+ from opal.db import backend, get_creation_module
+ from opal.db.models import GenericRel
data_types = get_creation_module().DATA_TYPES
@@ -252,7 +252,7 @@
def get_sql_delete(app):
"Returns a list of the DROP TABLE SQL statements for the given app."
- from django.db import backend, connection, models, get_introspection_module
+ from opal.db import backend, connection, models, get_introspection_module
introspection = get_introspection_module()
# This should work even if a connecton isn't available
@@ -329,8 +329,8 @@
get_sql_reset.args = APP_ARGS
def get_sql_initial_data_for_model(model):
- from django.db import models
- from django.conf import settings
+ from opal.db import models
+ from opal.conf import settings
opts = model._meta
app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), 'sql'))
@@ -355,7 +355,7 @@
def get_sql_initial_data(app):
"Returns a list of the initial INSERT SQL statements for the given app."
- from django.db.models import get_models
+ from opal.db.models import get_models
output = []
app_models = get_models(app)
@@ -370,7 +370,7 @@
def get_sql_sequence_reset(app):
"Returns a list of the SQL statements to reset PostgreSQL sequences for the given app."
- from django.db import backend, models
+ from opal.db import backend, models
output = []
for model in models.get_models(app):
for f in model._meta.fields:
@@ -397,7 +397,7 @@
def get_sql_indexes(app):
"Returns a list of the CREATE INDEX SQL statements for the given app."
- from django.db import backend, models
+ from opal.db import backend, models
output = []
for model in models.get_models(app):
@@ -423,10 +423,10 @@
def syncdb():
"Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
- from django.db import connection, transaction, models, get_creation_module
- from django.db.models import signals
- from django.conf import settings
- from django.dispatch import dispatcher
+ from opal.db import connection, transaction, models, get_creation_module
+ from opal.db.models import signals
+ from opal.conf import settings
+ from opal.dispatch import dispatcher
disable_termcolors()
@@ -511,8 +511,8 @@
def get_admin_index(app):
"Returns admin-index template snippet (in list form) for the given app."
- from django.utils.text import capfirst
- from django.db.models import get_models
+ from opal.utils.text import capfirst
+ from opal.db.models import get_models
output = []
app_models = get_models(app)
app_label = app_models[0]._meta.app_label
@@ -544,7 +544,7 @@
followed by "###".
"""
# Inspired by Postfix's "postconf -n".
- from django.conf import settings, global_settings
+ from opal.conf import settings, global_settings
user_settings = _module_to_dict(settings)
default_settings = _module_to_dict(global_settings)
@@ -562,7 +562,7 @@
def install(app):
"Executes the equivalent of 'get_sql_all' in the current database."
- from django.db import connection, transaction
+ from opal.db import connection, transaction
app_name = app.__name__.split('.')[-2]
@@ -592,7 +592,7 @@
def reset(app):
"Executes the equivalent of 'get_sql_reset' in the current database."
- from django.db import connection, transaction
+ from opal.db import connection, transaction
app_name = app.__name__.split('.')[-2]
disable_termcolors()
@@ -691,7 +691,7 @@
def inspectdb():
"Generator that introspects the tables in the given database name and returns a Django model, one line at a time."
- from django.db import connection, get_introspection_module
+ from opal.db import connection, get_introspection_module
import keyword
introspection_module = get_introspection_module()
@@ -710,7 +710,7 @@
yield "# Also note: You'll have to insert the output of 'django-admin.py sqlinitialdata [appname]'"
yield "# into your database."
yield ''
- yield 'from django.db import models'
+ yield 'from opal.db import models'
yield ''
for table_name in introspection_module.get_table_list(cursor):
yield 'class %s(models.Model):' % table2model(table_name)
@@ -812,9 +812,9 @@
validates all models of all installed apps. Writes errors, if any, to outfile.
Returns number of errors.
"""
- from django.db import models
- from django.db.models.loading import get_app_errors
- from django.db.models.fields.related import RelatedObject
+ from opal.db import models
+ from opal.db.models.loading import get_app_errors
+ from opal.db.models.fields.related import RelatedObject
e = ModelErrorCollection(outfile)
@@ -1025,8 +1025,8 @@
def runserver(addr, port, use_reloader=True):
"Starts a lightweight Web server for development."
- from django.core.servers.basehttp import run, AdminMediaHandler, WSGIServerException
- from django.core.handlers.wsgi import WSGIHandler
+ from opal.core.servers.basehttp import run, AdminMediaHandler, WSGIServerException
+ from opal.core.handlers.wsgi import WSGIHandler
if not addr:
addr = '127.0.0.1'
if not port.isdigit():
@@ -1034,7 +1034,7 @@
sys.exit(1)
quit_command = sys.platform == 'win32' and 'CTRL-BREAK' or 'CONTROL-C'
def inner_run():
- from django.conf import settings
+ from opal.conf import settings
print "Validating models..."
validate()
print "\nDjango version %s, using settings %r" % (get_version(), settings.SETTINGS_MODULE)
@@ -1058,7 +1058,7 @@
except KeyboardInterrupt:
sys.exit(0)
if use_reloader:
- from django.utils import autoreload
+ from opal.utils import autoreload
autoreload.main(inner_run)
else:
inner_run()
@@ -1066,7 +1066,7 @@
def createcachetable(tablename):
"Creates the table needed to use the SQL cache backend"
- from django.db import backend, connection, transaction, get_creation_module, models
+ from opal.db import backend, connection, transaction, get_creation_module, models
data_types = get_creation_module().DATA_TYPES
fields = (
# "key" is a reserved word in MySQL, so use "cache_key" instead.
@@ -1127,13 +1127,13 @@
def dbshell():
"Runs the command-line client for the current DATABASE_ENGINE."
- from django.db import runshell
+ from opal.db import runshell
runshell()
dbshell.args = ""
def runfcgi(args):
"""Run this project as a FastCGI application. requires flup."""
- from django.core.servers.fastcgi import runfastcgi
+ from opal.core.servers.fastcgi import runfastcgi
runfastcgi(args)
runfcgi.args = '[various KEY=val options, use `runfcgi help` for help]'
@@ -1234,7 +1234,7 @@
# like permissions, and those shouldn't contain any translations.
# But only do this if we should have a working settings file.
if action not in ('startproject', 'startapp'):
- from django.utils import translation
+ from opal.utils import translation
translation.activate('en-us')
if action == 'shell':
@@ -1272,7 +1272,7 @@
elif action == 'runfcgi':
action_mapping[action](args[1:])
else:
- from django.db import models
+ from opal.db import models
try:
mod_list = [models.get_app(app_label) for app_label in args[1:]]
except ImportError, e:
Modified: cs/pythia/trunk/opal/core/serializers/__init__.py
===================================================================
--- cs/pythia/trunk/opal/core/serializers/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/serializers/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -3,7 +3,7 @@
Usage::
- >>> from django.core import serializers
+ >>> from opal.core import serializers
>>> json = serializers.serialize("json", some_query_set)
>>> objects = list(serializers.deserialize("json", json))
@@ -16,13 +16,13 @@
"""
-from django.conf import settings
+from opal.conf import settings
# Built-in serializers
BUILTIN_SERIALIZERS = {
- "xml" : "django.core.serializers.xml_serializer",
- "python" : "django.core.serializers.python",
- "json" : "django.core.serializers.json",
+ "xml" : "opal.core.serializers.xml_serializer",
+ "python" : "opal.core.serializers.python",
+ "json" : "opal.core.serializers.json",
}
_serializers = {}
@@ -75,4 +75,4 @@
register_serializer(format, BUILTIN_SERIALIZERS[format])
if hasattr(settings, "SERIALIZATION_MODULES"):
for format in settings.SERIALIZATION_MODULES:
- register_serializer(format, settings.SERIALIZATION_MODULES[format])
\ No newline at end of file
+ register_serializer(format, settings.SERIALIZATION_MODULES[format])
Modified: cs/pythia/trunk/opal/core/serializers/base.py
===================================================================
--- cs/pythia/trunk/opal/core/serializers/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/serializers/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -6,7 +6,7 @@
from cStringIO import StringIO
except ImportError:
from StringIO import StringIO
-from django.db import models
+from opal.db import models
class SerializationError(Exception):
"""Something bad happened during serialization."""
Modified: cs/pythia/trunk/opal/core/serializers/json.py
===================================================================
--- cs/pythia/trunk/opal/core/serializers/json.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/serializers/json.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -3,9 +3,9 @@
"""
import datetime
-from django.utils import simplejson
-from django.core.serializers.python import Serializer as PythonSerializer
-from django.core.serializers.python import Deserializer as PythonDeserializer
+from opal.utils import simplejson
+from opal.core.serializers.python import Serializer as PythonSerializer
+from opal.core.serializers.python import Deserializer as PythonDeserializer
try:
from cStringIO import StringIO
except ImportError:
@@ -48,4 +48,4 @@
elif isinstance(o, datetime.datetime):
return o.strftime("%s %s" % (self.DATE_FORMAT, self.TIME_FORMAT))
else:
- return super(self, DateTimeAwareJSONEncoder).default(o)
\ No newline at end of file
+ return super(self, DateTimeAwareJSONEncoder).default(o)
Modified: cs/pythia/trunk/opal/core/serializers/python.py
===================================================================
--- cs/pythia/trunk/opal/core/serializers/python.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/serializers/python.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -4,9 +4,9 @@
other serializers.
"""
-from django.conf import settings
-from django.core.serializers import base
-from django.db import models
+from opal.conf import settings
+from opal.core.serializers import base
+from opal.db import models
class Serializer(base.Serializer):
"""
Modified: cs/pythia/trunk/opal/core/serializers/xml_serializer.py
===================================================================
--- cs/pythia/trunk/opal/core/serializers/xml_serializer.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/serializers/xml_serializer.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,10 +2,10 @@
XML serializer.
"""
-from django.conf import settings
-from django.core.serializers import base
-from django.db import models
-from django.utils.xmlutils import SimplerXMLGenerator
+from opal.conf import settings
+from opal.core.serializers import base
+from opal.db import models
+from opal.utils.xmlutils import SimplerXMLGenerator
from xml.dom import pulldom
class Serializer(base.Serializer):
@@ -214,4 +214,4 @@
inner_text.extend(getInnerText(child))
else:
pass
- return "".join(inner_text)
\ No newline at end of file
+ return "".join(inner_text)
Modified: cs/pythia/trunk/opal/core/servers/basehttp.py
===================================================================
--- cs/pythia/trunk/opal/core/servers/basehttp.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/servers/basehttp.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -532,7 +532,7 @@
server_version = "WSGIServer/" + __version__
def __init__(self, *args, **kwargs):
- from django.conf import settings
+ from opal.conf import settings
self.admin_media_prefix = settings.ADMIN_MEDIA_PREFIX
BaseHTTPRequestHandler.__init__(self, *args, **kwargs)
@@ -599,10 +599,10 @@
security and is not super efficient.
"""
def __init__(self, application):
- from django.conf import settings
+ from opal.conf import settings
import django
self.application = application
- self.media_dir = django.__path__[0] + '/contrib/admin/media'
+ self.media_dir = opal.__path__[0] + '/contrib/admin/media'
self.media_url = settings.ADMIN_MEDIA_PREFIX
def __call__(self, environ, start_response):
Modified: cs/pythia/trunk/opal/core/servers/fastcgi.py
===================================================================
--- cs/pythia/trunk/opal/core/servers/fastcgi.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/servers/fastcgi.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -112,7 +112,7 @@
wsgi_opts['debug'] = False # Turn off flup tracebacks
# Prep up and go
- from django.core.handlers.wsgi import WSGIHandler
+ from opal.core.handlers.wsgi import WSGIHandler
if options["host"] and options["port"] and not options["socket"]:
wsgi_opts['bindAddress'] = (options["host"], int(options["port"]))
@@ -135,7 +135,7 @@
return fastcgi_help("ERROR: Invalid option for daemonize parameter.")
if daemonize:
- from django.utils.daemonize import become_daemon
+ from opal.utils.daemonize import become_daemon
become_daemon(our_home_dir=options["workdir"])
if options["pidfile"]:
Modified: cs/pythia/trunk/opal/core/template_loader.py
===================================================================
--- cs/pythia/trunk/opal/core/template_loader.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/template_loader.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
# This module is DEPRECATED!
#
-# You should no longer be using django.template_loader.
+# You should no longer be using opal.template_loader.
#
-# Use django.template.loader instead.
+# Use opal.template.loader instead.
-from django.template.loader import *
+from opal.template.loader import *
Modified: cs/pythia/trunk/opal/core/urlresolvers.py
===================================================================
--- cs/pythia/trunk/opal/core/urlresolvers.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/urlresolvers.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -7,8 +7,8 @@
(view_function, function_args, function_kwargs)
"""
-from django.http import Http404
-from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
+from opal.http import Http404
+from opal.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
import re
class Resolver404(Http404):
@@ -18,8 +18,8 @@
pass
def get_mod_func(callback):
- # Converts 'django.views.news.stories.story_detail' to
- # ['django.views.news.stories', 'story_detail']
+ # Converts 'opal.views.news.stories.story_detail' to
+ # ['opal.views.news.stories', 'story_detail']
dot = callback.rindex('.')
return callback[:dot], callback[dot+1:]
@@ -204,7 +204,7 @@
def resolve(path, urlconf=None):
if urlconf is None:
- from django.conf import settings
+ from opal.conf import settings
urlconf = settings.ROOT_URLCONF
resolver = RegexURLResolver(r'^/', urlconf)
return resolver.resolve(path)
@@ -213,7 +213,7 @@
args = args or []
kwargs = kwargs or {}
if urlconf is None:
- from django.conf import settings
+ from opal.conf import settings
urlconf = settings.ROOT_URLCONF
resolver = RegexURLResolver(r'^/', urlconf)
return '/' + resolver.reverse(viewname, *args, **kwargs)
Modified: cs/pythia/trunk/opal/core/validators.py
===================================================================
--- cs/pythia/trunk/opal/core/validators.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/validators.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -8,9 +8,9 @@
form field is required.
"""
-from django.conf import settings
-from django.utils.translation import gettext, gettext_lazy, ngettext
-from django.utils.functional import Promise, lazy
+from opal.conf import settings
+from opal.utils.translation import gettext, gettext_lazy, ngettext
+from opal.utils.functional import Promise, lazy
import re
_datere = r'(19|2\d)\d{2}-((?:0?[1-9])|(?:1[0-2]))-((?:0?[1-9])|(?:[12][0-9])|(?:3[0-1]))'
@@ -231,7 +231,7 @@
field_data = field_data.lower() # normalize
words_seen = [w for w in bad_words if field_data.find(w) > -1]
if words_seen:
- from django.utils.text import get_text_list
+ from opal.utils.text import get_text_list
plural = len(words_seen) > 1
raise ValidationError, ngettext("Watch your mouth! The word %s is not allowed here.",
"Watch your mouth! The words %s are not allowed here.", plural) % \
@@ -331,7 +331,7 @@
>>> v(8, None)
>>> v(16, None)
>>> v(17, None)
- django.core.validators.ValidationError: ['This value must be a power of 2.']
+ opal.core.validators.ValidationError: ['This value must be a power of 2.']
"""
def __init__(self, power_of):
self.power_of = power_of
Modified: cs/pythia/trunk/opal/core/xheaders.py
===================================================================
--- cs/pythia/trunk/opal/core/xheaders.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/core/xheaders.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -15,7 +15,7 @@
HttpResponse according to the given model and object_id -- but only if the
given HttpRequest object has an IP address within the INTERNAL_IPS setting.
"""
- from django.conf import settings
+ from opal.conf import settings
if request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS:
response['X-Object-Type'] = "%s.%s" % (model._meta.app_label, model._meta.object_name.lower())
response['X-Object-Id'] = str(object_id)
Modified: cs/pythia/trunk/opal/db/__init__.py
===================================================================
--- cs/pythia/trunk/opal/db/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.conf import settings
-from django.core import signals
-from django.dispatch import dispatcher
+from opal.conf import settings
+from opal.core import signals
+from opal.dispatch import dispatcher
__all__ = ('backend', 'connection', 'DatabaseError')
@@ -8,11 +8,11 @@
settings.DATABASE_ENGINE = 'dummy'
try:
- backend = __import__('django.db.backends.%s.base' % settings.DATABASE_ENGINE, '', '', [''])
+ backend = __import__('opal.db.backends.%s.base' % settings.DATABASE_ENGINE, '', '', [''])
except ImportError, e:
# The database backend wasn't found. Display a helpful error message
# listing all possible database backends.
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
import os
backend_dir = os.path.join(__path__[0], 'backends')
available_backends = [f for f in os.listdir(backend_dir) if not f.startswith('_') and not f.startswith('.') and not f.endswith('.py') and not f.endswith('.pyc')]
@@ -23,9 +23,9 @@
else:
raise # If there's some other error, this must be an error in Django itself.
-get_introspection_module = lambda: __import__('django.db.backends.%s.introspection' % settings.DATABASE_ENGINE, '', '', [''])
-get_creation_module = lambda: __import__('django.db.backends.%s.creation' % settings.DATABASE_ENGINE, '', '', [''])
-runshell = lambda: __import__('django.db.backends.%s.client' % settings.DATABASE_ENGINE, '', '', ['']).runshell()
+get_introspection_module = lambda: __import__('opal.db.backends.%s.introspection' % settings.DATABASE_ENGINE, '', '', [''])
+get_creation_module = lambda: __import__('opal.db.backends.%s.creation' % settings.DATABASE_ENGINE, '', '', [''])
+runshell = lambda: __import__('opal.db.backends.%s.client' % settings.DATABASE_ENGINE, '', '', ['']).runshell()
connection = backend.DatabaseWrapper()
DatabaseError = backend.DatabaseError
@@ -43,6 +43,6 @@
# Register an event that rolls back the connection
# when a Django request has an exception.
def _rollback_on_exception():
- from django.db import transaction
+ from opal.db import transaction
transaction.rollback_unless_managed()
dispatcher.connect(_rollback_on_exception, signal=signals.got_request_exception)
Modified: cs/pythia/trunk/opal/db/backends/ado_mssql/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/ado_mssql/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/ado_mssql/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -4,11 +4,11 @@
Requires adodbapi 2.0.1: http://adodbapi.sourceforge.net/
"""
-from django.db.backends import util
+from opal.db.backends import util
try:
import adodbapi as Database
except ImportError, e:
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "Error loading adodbapi module: %s" % e
import datetime
try:
@@ -52,7 +52,7 @@
from threading import local
except ImportError:
# Import copy of _thread_local.py from Python 2.4
- from django.utils._threading_local import local
+ from opal.utils._threading_local import local
class DatabaseWrapper(local):
def __init__(self):
@@ -60,10 +60,10 @@
self.queries = []
def cursor(self):
- from django.conf import settings
+ from opal.conf import settings
if self.connection is None:
if settings.DATABASE_NAME == '' or settings.DATABASE_USER == '':
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "You need to specify both DATABASE_NAME and DATABASE_USER in your Django settings file."
if not settings.DATABASE_HOST:
settings.DATABASE_HOST = "127.0.0.1"
Modified: cs/pythia/trunk/opal/db/backends/dummy/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/dummy/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/dummy/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -7,7 +7,7 @@
ImproperlyConfigured.
"""
-from django.core.exceptions import ImproperlyConfigured
+from opal.core.exceptions import ImproperlyConfigured
def complain(*args, **kwargs):
raise ImproperlyConfigured, "You haven't set the DATABASE_ENGINE setting yet."
Modified: cs/pythia/trunk/opal/db/backends/dummy/client.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/dummy/client.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/dummy/client.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,3 +1,3 @@
-from django.db.backends.dummy.base import complain
+from opal.db.backends.dummy.base import complain
runshell = complain
Modified: cs/pythia/trunk/opal/db/backends/dummy/introspection.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/dummy/introspection.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/dummy/introspection.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.db.backends.dummy.base import complain
+from opal.db.backends.dummy.base import complain
get_table_list = complain
get_table_description = complain
Modified: cs/pythia/trunk/opal/db/backends/mysql/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/mysql/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/mysql/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -4,11 +4,11 @@
Requires MySQLdb: http://sourceforge.net/projects/mysql-python
"""
-from django.db.backends import util
+from opal.db.backends import util
try:
import MySQLdb as Database
except ImportError, e:
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "Error loading MySQLdb module: %s" % e
from MySQLdb.converters import conversions
from MySQLdb.constants import FIELD_TYPE
@@ -55,7 +55,7 @@
from threading import local
except ImportError:
# Import copy of _thread_local.py from Python 2.4
- from django.utils._threading_local import local
+ from opal.utils._threading_local import local
class DatabaseWrapper(local):
def __init__(self):
@@ -73,7 +73,7 @@
return False
def cursor(self):
- from django.conf import settings
+ from opal.conf import settings
if not self._valid_connection():
kwargs = {
'user': settings.DATABASE_USER,
Modified: cs/pythia/trunk/opal/db/backends/mysql/client.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/mysql/client.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/mysql/client.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.conf import settings
+from opal.conf import settings
import os
def runshell():
Modified: cs/pythia/trunk/opal/db/backends/mysql/introspection.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/mysql/introspection.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/mysql/introspection.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.db.backends.mysql.base import quote_name
+from opal.db.backends.mysql.base import quote_name
from MySQLdb import ProgrammingError, OperationalError
from MySQLdb.constants import FIELD_TYPE
import re
Modified: cs/pythia/trunk/opal/db/backends/oracle/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/oracle/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/oracle/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -4,11 +4,11 @@
Requires cx_Oracle: http://www.python.net/crew/atuining/cx_Oracle/
"""
-from django.db.backends import util
+from opal.db.backends import util
try:
import cx_Oracle as Database
except ImportError, e:
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e
DatabaseError = Database.Error
@@ -18,7 +18,7 @@
from threading import local
except ImportError:
# Import copy of _thread_local.py from Python 2.4
- from django.utils._threading_local import local
+ from opal.utils._threading_local import local
class DatabaseWrapper(local):
def __init__(self):
@@ -29,7 +29,7 @@
return self.connection is not None
def cursor(self):
- from django.conf import settings
+ from opal.conf import settings
if not self._valid_connection():
if len(settings.DATABASE_HOST.strip()) == 0:
settings.DATABASE_HOST = 'localhost'
Modified: cs/pythia/trunk/opal/db/backends/oracle/client.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/oracle/client.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/oracle/client.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.conf import settings
+from opal.conf import settings
import os
def runshell():
Modified: cs/pythia/trunk/opal/db/backends/postgresql/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/postgresql/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/postgresql/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -4,11 +4,11 @@
Requires psycopg 1: http://initd.org/projects/psycopg1
"""
-from django.db.backends import util
+from opal.db.backends import util
try:
import psycopg as Database
except ImportError, e:
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "Error loading psycopg module: %s" % e
DatabaseError = Database.DatabaseError
@@ -18,7 +18,7 @@
from threading import local
except ImportError:
# Import copy of _thread_local.py from Python 2.4
- from django.utils._threading_local import local
+ from opal.utils._threading_local import local
class DatabaseWrapper(local):
def __init__(self):
@@ -26,10 +26,10 @@
self.queries = []
def cursor(self):
- from django.conf import settings
+ from opal.conf import settings
if self.connection is None:
if settings.DATABASE_NAME == '':
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "You need to specify DATABASE_NAME in your Django settings file."
conn_string = "dbname=%s" % settings.DATABASE_NAME
if settings.DATABASE_USER:
Modified: cs/pythia/trunk/opal/db/backends/postgresql/client.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/postgresql/client.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/postgresql/client.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.conf import settings
+from opal.conf import settings
import os
def runshell():
Modified: cs/pythia/trunk/opal/db/backends/postgresql/introspection.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/postgresql/introspection.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/postgresql/introspection.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.db.backends.postgresql.base import quote_name
+from opal.db.backends.postgresql.base import quote_name
def get_table_list(cursor):
"Returns a list of table names in the current database."
Modified: cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -4,11 +4,11 @@
Requires psycopg 2: http://initd.org/projects/psycopg2
"""
-from django.db.backends import util
+from opal.db.backends import util
try:
import psycopg2 as Database
except ImportError, e:
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "Error loading psycopg2 module: %s" % e
DatabaseError = Database.DatabaseError
@@ -18,7 +18,7 @@
from threading import local
except ImportError:
# Import copy of _thread_local.py from Python 2.4
- from django.utils._threading_local import local
+ from opal.utils._threading_local import local
class DatabaseWrapper(local):
def __init__(self):
@@ -26,10 +26,10 @@
self.queries = []
def cursor(self):
- from django.conf import settings
+ from opal.conf import settings
if self.connection is None:
if settings.DATABASE_NAME == '':
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "You need to specify DATABASE_NAME in your Django settings file."
conn_string = "dbname=%s" % settings.DATABASE_NAME
if settings.DATABASE_USER:
Modified: cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/client.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/client.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/client.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1 +1 @@
-from django.db.backends.postgresql.client import *
+from opal.db.backends.postgresql.client import *
Modified: cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/creation.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/creation.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/creation.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1 +1 @@
-from django.db.backends.postgresql.creation import *
+from opal.db.backends.postgresql.creation import *
Modified: cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/introspection.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/introspection.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/postgresql_psycopg2/introspection.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.db.backends.postgresql_psycopg2.base import quote_name
+from opal.db.backends.postgresql_psycopg2.base import quote_name
def get_table_list(cursor):
"Returns a list of table names in the current database."
Modified: cs/pythia/trunk/opal/db/backends/sqlite3/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/sqlite3/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/sqlite3/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,12 +1,12 @@
"""
-SQLite3 backend for django. Requires pysqlite2 (http://pysqlite.org/).
+SQLite3 backend for opal. Requires pysqlite2 (http://pysqlite.org/).
"""
-from django.db.backends import util
+from opal.db.backends import util
try:
from pysqlite2 import dbapi2 as Database
except ImportError, e:
- from django.core.exceptions import ImproperlyConfigured
+ from opal.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured, "Error loading pysqlite2 module: %s" % e
DatabaseError = Database.DatabaseError
@@ -31,7 +31,7 @@
from threading import local
except ImportError:
# Import copy of _thread_local.py from Python 2.4
- from django.utils._threading_local import local
+ from opal.utils._threading_local import local
class DatabaseWrapper(local):
def __init__(self):
@@ -39,7 +39,7 @@
self.queries = []
def cursor(self):
- from django.conf import settings
+ from opal.conf import settings
if self.connection is None:
self.connection = Database.connect(settings.DATABASE_NAME,
detect_types=Database.PARSE_DECLTYPES | Database.PARSE_COLNAMES)
Modified: cs/pythia/trunk/opal/db/backends/sqlite3/client.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/sqlite3/client.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/sqlite3/client.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.conf import settings
+from opal.conf import settings
import os
def runshell():
Modified: cs/pythia/trunk/opal/db/backends/sqlite3/introspection.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/sqlite3/introspection.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/backends/sqlite3/introspection.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.db.backends.sqlite3.base import quote_name
+from opal.db.backends.sqlite3.base import quote_name
def get_table_list(cursor):
"Returns a list of table names in the current database."
Modified: cs/pythia/trunk/opal/db/models/__init__.py
===================================================================
--- cs/pythia/trunk/opal/db/models/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,17 +1,17 @@
-from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
-from django.core import validators
-from django.db import backend, connection
-from django.db.models.loading import get_apps, get_app, get_models, get_model, register_models
-from django.db.models.query import Q
-from django.db.models.manager import Manager
-from django.db.models.base import Model, AdminOptions
-from django.db.models.fields import *
-from django.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED
-from django.db.models.fields.generic import GenericRelation, GenericRel, GenericForeignKey
-from django.db.models import signals
-from django.utils.functional import curry
-from django.utils.text import capfirst
+from opal.conf import settings
+from opal.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
+from opal.core import validators
+from opal.db import backend, connection
+from opal.db.models.loading import get_apps, get_app, get_models, get_model, register_models
+from opal.db.models.query import Q
+from opal.db.models.manager import Manager
+from opal.db.models.base import Model, AdminOptions
+from opal.db.models.fields import *
+from opal.db.models.fields.related import ForeignKey, OneToOneField, ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel, TABULAR, STACKED
+from opal.db.models.fields.generic import GenericRelation, GenericRel, GenericForeignKey
+from opal.db.models import signals
+from opal.utils.functional import curry
+from opal.utils.text import capfirst
# Admin stages.
ADD, CHANGE, BOTH = 1, 2, 3
@@ -21,7 +21,7 @@
# Returns a function that calls urlresolvers.reverse() on that data, to return
# the URL for those parameters.
def permalink(func):
- from django.core.urlresolvers import reverse
+ from opal.core.urlresolvers import reverse
def inner(*args, **kwargs):
bits = func(*args, **kwargs)
viewname = bits[0]
Modified: cs/pythia/trunk/opal/db/models/base.py
===================================================================
--- cs/pythia/trunk/opal/db/models/base.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/base.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,18 +1,18 @@
-import django.db.models.manipulators
-import django.db.models.manager
-from django.core import validators
-from django.core.exceptions import ObjectDoesNotExist
-from django.db.models.fields import AutoField, ImageField, FieldDoesNotExist
-from django.db.models.fields.related import OneToOneRel, ManyToOneRel
-from django.db.models.query import delete_objects
-from django.db.models.options import Options, AdminOptions
-from django.db import connection, backend, transaction
-from django.db.models import signals
-from django.db.models.loading import register_models, get_model
-from django.dispatch import dispatcher
-from django.utils.datastructures import SortedDict
-from django.utils.functional import curry
-from django.conf import settings
+import opal.db.models.manipulators
+import opal.db.models.manager
+from opal.core import validators
+from opal.core.exceptions import ObjectDoesNotExist
+from opal.db.models.fields import AutoField, ImageField, FieldDoesNotExist
+from opal.db.models.fields.related import OneToOneRel, ManyToOneRel
+from opal.db.models.query import delete_objects
+from opal.db.models.options import Options, AdminOptions
+from opal.db import connection, backend, transaction
+from opal.db.models import signals
+from opal.db.models.loading import register_models, get_model
+from opal.dispatch import dispatcher
+from opal.utils.datastructures import SortedDict
+from opal.utils.functional import curry
+from opal.conf import settings
import types
import sys
import os
@@ -40,7 +40,7 @@
if getattr(new_class._meta, 'app_label', None) is None:
# Figure out the app_label by looking one level up.
- # For 'django.contrib.sites.models', this would be 'sites'.
+ # For 'opal.contrib.sites.models', this would be 'sites'.
new_class._meta.app_label = model_module.__name__.split('.')[-2]
# Bail out early if we have already created this class.
@@ -349,7 +349,7 @@
# Save the width and/or height, if applicable.
if isinstance(field, ImageField) and (field.width_field or field.height_field):
- from django.utils.images import get_image_dimensions
+ from opal.utils.images import get_image_dimensions
width, height = get_image_dimensions(full_filename)
if field.width_field:
setattr(self, field.width_field, width)
@@ -370,7 +370,7 @@
def _get_image_dimensions(self, field):
cachename = "__%s_dimensions_cache" % field.name
if not hasattr(self, cachename):
- from django.utils.images import get_image_dimensions
+ from opal.utils.images import get_image_dimensions
filename = self._get_FIELD_filename(field)
setattr(self, cachename, get_image_dimensions(filename))
return getattr(self, cachename)
Modified: cs/pythia/trunk/opal/db/models/fields/__init__.py
===================================================================
--- cs/pythia/trunk/opal/db/models/fields/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/fields/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,12 +1,12 @@
-from django.db.models import signals
-from django.dispatch import dispatcher
-from django.conf import settings
-from django.core import validators
+from opal.db.models import signals
+from opal.dispatch import dispatcher
+from opal.conf import settings
+from opal.core import validators
from django import forms
-from django.core.exceptions import ObjectDoesNotExist
-from django.utils.functional import curry
-from django.utils.text import capfirst
-from django.utils.translation import gettext, gettext_lazy
+from opal.core.exceptions import ObjectDoesNotExist
+from opal.utils.functional import curry
+from opal.utils.text import capfirst
+from opal.utils.translation import gettext, gettext_lazy
import datetime, os, time
class NOT_PROVIDED:
@@ -605,7 +605,7 @@
return os.path.normpath(datetime.datetime.now().strftime(self.upload_to))
def get_filename(self, filename):
- from django.utils.text import get_valid_filename
+ from opal.utils.text import get_valid_filename
f = os.path.join(self.get_directory_name(), get_valid_filename(os.path.basename(filename)))
return os.path.normpath(f)
Modified: cs/pythia/trunk/opal/db/models/fields/generic.py
===================================================================
--- cs/pythia/trunk/opal/db/models/fields/generic.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/fields/generic.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -3,13 +3,13 @@
"""
from django import forms
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import backend
-from django.db.models import signals
-from django.db.models.fields.related import RelatedField, Field, ManyToManyRel
-from django.db.models.loading import get_model
-from django.dispatch import dispatcher
-from django.utils.functional import curry
+from opal.core.exceptions import ObjectDoesNotExist
+from opal.db import backend
+from opal.db.models import signals
+from opal.db.models.fields.related import RelatedField, Field, ManyToManyRel
+from opal.db.models.loading import get_model
+from opal.dispatch import dispatcher
+from opal.utils.functional import curry
class GenericForeignKey(object):
"""
@@ -154,7 +154,7 @@
raise AttributeError, "Manager must be accessed via instance"
# This import is done here to avoid circular import importing this module
- from django.contrib.contenttypes.models import ContentType
+ from opal.contrib.contenttypes.models import ContentType
# Dynamically create a class that subclasses the related model's
# default manager.
Modified: cs/pythia/trunk/opal/db/models/fields/related.py
===================================================================
--- cs/pythia/trunk/opal/db/models/fields/related.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/fields/related.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,12 +1,12 @@
-from django.db import backend, transaction
-from django.db.models import signals, get_model
-from django.db.models.fields import AutoField, Field, IntegerField, get_ul_class
-from django.db.models.related import RelatedObject
-from django.utils.translation import gettext_lazy, string_concat
-from django.utils.functional import curry
-from django.core import validators
+from opal.db import backend, transaction
+from opal.db.models import signals, get_model
+from opal.db.models.fields import AutoField, Field, IntegerField, get_ul_class
+from opal.db.models.related import RelatedObject
+from opal.utils.translation import gettext_lazy, string_concat
+from opal.utils.functional import curry
+from opal.core import validators
from django import forms
-from django.dispatch import dispatcher
+from opal.dispatch import dispatcher
# For Python 2.3
if not hasattr(__builtins__, 'set'):
@@ -316,7 +316,7 @@
# source_col_name: the PK colname in join_table for the source object
# target_col_name: the PK colname in join_table for the target object
# *objs - objects to add
- from django.db import connection
+ from opal.db import connection
# Add the newly created or already existing objects to the join table.
# First find out which items are already added, to avoid adding them twice
@@ -342,7 +342,7 @@
# source_col_name: the PK colname in join_table for the source object
# target_col_name: the PK colname in join_table for the target object
# *objs - objects to remove
- from django.db import connection
+ from opal.db import connection
for obj in objs:
if not isinstance(obj, self.model):
@@ -357,7 +357,7 @@
def _clear_items(self, source_col_name):
# source_col_name: the PK colname in join_table for the source object
- from django.db import connection
+ from opal.db import connection
cursor = connection.cursor()
cursor.execute("DELETE FROM %s WHERE %s = %%s" % \
(self.join_table, source_col_name),
Modified: cs/pythia/trunk/opal/db/models/loading.py
===================================================================
--- cs/pythia/trunk/opal/db/models/loading.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/loading.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
"Utilities for loading models and the modules that contain them."
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
+from opal.conf import settings
+from opal.core.exceptions import ImproperlyConfigured
import sys
import os
Modified: cs/pythia/trunk/opal/db/models/manager.py
===================================================================
--- cs/pythia/trunk/opal/db/models/manager.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/manager.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.db.models.query import QuerySet
-from django.dispatch import dispatcher
-from django.db.models import signals
-from django.db.models.fields import FieldDoesNotExist
+from opal.db.models.query import QuerySet
+from opal.dispatch import dispatcher
+from opal.db.models import signals
+from opal.db.models.fields import FieldDoesNotExist
# Size of each "chunk" for get_iterator calls.
# Larger values are slightly faster at the expense of more storage space.
Modified: cs/pythia/trunk/opal/db/models/manipulators.py
===================================================================
--- cs/pythia/trunk/opal/db/models/manipulators.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/manipulators.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,12 +1,12 @@
-from django.core.exceptions import ObjectDoesNotExist
+from opal.core.exceptions import ObjectDoesNotExist
from django import forms
-from django.core import validators
-from django.db.models.fields import FileField, AutoField
-from django.dispatch import dispatcher
-from django.db.models import signals
-from django.utils.functional import curry
-from django.utils.datastructures import DotExpandedDict
-from django.utils.text import capfirst
+from opal.core import validators
+from opal.db.models.fields import FileField, AutoField
+from opal.dispatch import dispatcher
+from opal.db.models import signals
+from opal.utils.functional import curry
+from opal.utils.datastructures import DotExpandedDict
+from opal.utils.text import capfirst
import types
def add_manipulators(sender):
@@ -272,8 +272,8 @@
super(AutomaticChangeManipulator, self).__init__(follow=follow)
def manipulator_validator_unique_together(field_name_list, opts, self, field_data, all_data):
- from django.db.models.fields.related import ManyToOneRel
- from django.utils.text import get_text_list
+ from opal.db.models.fields.related import ManyToOneRel
+ from opal.utils.text import get_text_list
field_list = [opts.get_field(field_name) for field_name in field_name_list]
if isinstance(field_list[0].rel, ManyToOneRel):
kwargs = {'%s__%s__iexact' % (field_name_list[0], field_list[0].rel.field_name): field_data}
@@ -303,7 +303,7 @@
{'object': capfirst(opts.verbose_name), 'type': field_list[0].verbose_name, 'field': get_text_list(field_name_list[1:], 'and')}
def manipulator_validator_unique_for_date(from_field, date_field, opts, lookup_type, self, field_data, all_data):
- from django.db.models.fields.related import ManyToOneRel
+ from opal.db.models.fields.related import ManyToOneRel
date_str = all_data.get(date_field.get_manipulator_field_names('')[0], None)
date_val = forms.DateField.html2python(date_str)
if date_val is None:
Modified: cs/pythia/trunk/opal/db/models/options.py
===================================================================
--- cs/pythia/trunk/opal/db/models/options.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/options.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,10 +1,10 @@
-from django.conf import settings
-from django.db.models.related import RelatedObject
-from django.db.models.fields.related import ManyToManyRel
-from django.db.models.fields import AutoField, FieldDoesNotExist
-from django.db.models.loading import get_models
-from django.db.models.query import orderlist2sql
-from django.db.models import Manager
+from opal.conf import settings
+from opal.db.models.related import RelatedObject
+from opal.db.models.fields.related import ManyToManyRel
+from opal.db.models.fields import AutoField, FieldDoesNotExist
+from opal.db.models.loading import get_models
+from opal.db.models.query import orderlist2sql
+from opal.db.models import Manager
from bisect import bisect
import re
Modified: cs/pythia/trunk/opal/db/models/query.py
===================================================================
--- cs/pythia/trunk/opal/db/models/query.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/models/query.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-from django.db import backend, connection, transaction
-from django.db.models.fields import DateField, FieldDoesNotExist
-from django.db.models import signals
-from django.dispatch import dispatcher
-from django.utils.datastructures import SortedDict
+from opal.db import backend, connection, transaction
+from opal.db.models.fields import DateField, FieldDoesNotExist
+from opal.db.models import signals
+from opal.dispatch import dispatcher
+from opal.utils.datastructures import SortedDict
import operator
import re
@@ -540,7 +540,7 @@
class DateQuerySet(QuerySet):
def iterator(self):
- from django.db.backends.util import typecast_timestamp
+ from opal.db.backends.util import typecast_timestamp
self._order_by = () # Clear this because it'll mess things up otherwise.
if self._field.null:
self._where.append('%s.%s IS NOT NULL' % \
Modified: cs/pythia/trunk/opal/db/transaction.py
===================================================================
--- cs/pythia/trunk/opal/db/transaction.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/db/transaction.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -16,8 +16,8 @@
import thread
except ImportError:
import dummy_thread as thread
-from django.db import connection
-from django.conf import settings
+from opal.db import connection
+from opal.conf import settings
class TransactionManagementError(Exception):
"""
Modified: cs/pythia/trunk/opal/dispatch/dispatcher.py
===================================================================
--- cs/pythia/trunk/opal/dispatch/dispatcher.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/dispatch/dispatcher.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -27,7 +27,7 @@
"""
from __future__ import generators
import types, weakref
-from django.dispatch import saferef, robustapply, errors
+from opal.dispatch import saferef, robustapply, errors
__author__ = "Patrick K. O'Brien <pobrien at orbtech.com>"
__cvsid__ = "$Id: dispatcher.py,v 1.9 2005/09/17 04:55:57 mcfletch Exp $"
Modified: cs/pythia/trunk/opal/dispatch/robust.py
===================================================================
--- cs/pythia/trunk/opal/dispatch/robust.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/dispatch/robust.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"""Module implementing error-catching version of send (sendRobust)"""
-from django.dispatch.dispatcher import Any, Anonymous, liveReceivers, getAllReceivers
-from django.dispatch.robustapply import robustApply
+from opal.dispatch.dispatcher import Any, Anonymous, liveReceivers, getAllReceivers
+from opal.dispatch.robustapply import robustApply
def sendRobust(
signal=Any,
Modified: cs/pythia/trunk/opal/forms/__init__.py
===================================================================
--- cs/pythia/trunk/opal/forms/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/forms/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-from django.core import validators
-from django.core.exceptions import PermissionDenied
-from django.utils.html import escape
-from django.conf import settings
-from django.utils.translation import gettext, gettext_lazy, ngettext
+from opal.core import validators
+from opal.core.exceptions import PermissionDenied
+from opal.utils.html import escape
+from opal.conf import settings
+from opal.utils.translation import gettext, gettext_lazy, ngettext
FORM_FIELD_ID_PREFIX = 'id_'
@@ -903,7 +903,7 @@
"A SelectField whose choices are the files in a given directory."
def __init__(self, field_name, path, match=None, recursive=False, is_required=False, validator_list=None):
import os
- from django.db.models import BLANK_CHOICE_DASH
+ from opal.db.models import BLANK_CHOICE_DASH
if match is not None:
import re
match_re = re.compile(match)
Modified: cs/pythia/trunk/opal/http/__init__.py
===================================================================
--- cs/pythia/trunk/opal/http/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/http/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,7 +2,7 @@
from Cookie import SimpleCookie
from pprint import pformat
from urllib import urlencode, quote
-from django.utils.datastructures import MultiValueDict
+from opal.utils.datastructures import MultiValueDict
RESERVED_CHARS="!*'();:@&=+$,/?%#[]"
@@ -156,7 +156,7 @@
class HttpResponse(object):
"A basic HTTP response, with content and dictionary-accessed headers"
def __init__(self, content='', mimetype=None):
- from django.conf import settings
+ from opal.conf import settings
self._charset = settings.DEFAULT_CHARSET
if not mimetype:
mimetype = "%s; charset=%s" % (settings.DEFAULT_CONTENT_TYPE, settings.DEFAULT_CHARSET)
Modified: cs/pythia/trunk/opal/middleware/cache.py
===================================================================
--- cs/pythia/trunk/opal/middleware/cache.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/middleware/cache.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.conf import settings
-from django.core.cache import cache
-from django.utils.cache import get_cache_key, learn_cache_key, patch_response_headers
+from opal.conf import settings
+from opal.core.cache import cache
+from opal.utils.cache import get_cache_key, learn_cache_key, patch_response_headers
class CacheMiddleware(object):
"""
Modified: cs/pythia/trunk/opal/middleware/common.py
===================================================================
--- cs/pythia/trunk/opal/middleware/common.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/middleware/common.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.conf import settings
+from opal.conf import settings
from django import http
-from django.core.mail import mail_managers
+from opal.core.mail import mail_managers
import md5
class CommonMiddleware(object):
Modified: cs/pythia/trunk/opal/middleware/doc.py
===================================================================
--- cs/pythia/trunk/opal/middleware/doc.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/middleware/doc.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.conf import settings
+from opal.conf import settings
from django import http
class XViewMiddleware(object):
Modified: cs/pythia/trunk/opal/middleware/gzip.py
===================================================================
--- cs/pythia/trunk/opal/middleware/gzip.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/middleware/gzip.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
import re
-from django.utils.text import compress_string
-from django.utils.cache import patch_vary_headers
+from opal.utils.text import compress_string
+from opal.utils.cache import patch_vary_headers
re_accepts_gzip = re.compile(r'\bgzip\b')
Modified: cs/pythia/trunk/opal/middleware/locale.py
===================================================================
--- cs/pythia/trunk/opal/middleware/locale.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/middleware/locale.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
"this is the locale selecting middleware that will look at accept headers"
-from django.utils.cache import patch_vary_headers
-from django.utils import translation
+from opal.utils.cache import patch_vary_headers
+from opal.utils import translation
class LocaleMiddleware(object):
"""
Modified: cs/pythia/trunk/opal/middleware/transaction.py
===================================================================
--- cs/pythia/trunk/opal/middleware/transaction.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/middleware/transaction.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.db import transaction
+from opal.db import transaction
class TransactionMiddleware(object):
"""
Modified: cs/pythia/trunk/opal/scripts/daily_cleanup.py
===================================================================
--- cs/pythia/trunk/opal/scripts/daily_cleanup.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/scripts/daily_cleanup.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"Daily cleanup file"
-from django.db import backend, connection, transaction
+from opal.db import backend, connection, transaction
DOCUMENTATION_DIRECTORY = '/home/html/documentation/'
Modified: cs/pythia/trunk/opal/scripts/django-admin.py
===================================================================
--- cs/pythia/trunk/opal/scripts/django-admin.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/scripts/django-admin.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-from django.core import management
+from opal.core import management
if __name__ == "__main__":
management.execute_from_command_line()
Modified: cs/pythia/trunk/opal/scripts/make-messages.py
===================================================================
--- cs/pythia/trunk/opal/scripts/make-messages.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/scripts/make-messages.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,10 +1,10 @@
#!/usr/bin/env python
# Need to ensure that the i18n framework is enabled
-from django.conf import settings
+from opal.conf import settings
settings.configure(USE_I18N = True)
-from django.utils.translation import templatize
+from opal.utils.translation import templatize
import re
import os
import sys
Modified: cs/pythia/trunk/opal/shortcuts/__init__.py
===================================================================
--- cs/pythia/trunk/opal/shortcuts/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/shortcuts/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,8 +2,8 @@
# of MVC. In other words, these functions/classes introduce controlled coupling
# for convenience's sake.
-from django.template import loader
-from django.http import HttpResponse, Http404
+from opal.template import loader
+from opal.http import HttpResponse, Http404
def render_to_response(*args, **kwargs):
Modified: cs/pythia/trunk/opal/template/__init__.py
===================================================================
--- cs/pythia/trunk/opal/template/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -56,10 +56,10 @@
"""
import re
from inspect import getargspec
-from django.conf import settings
-from django.template.context import Context, RequestContext, ContextPopException
-from django.utils.functional import curry
-from django.utils.text import smart_split
+from opal.conf import settings
+from opal.template.context import Context, RequestContext, ContextPopException
+from opal.utils.functional import curry
+from opal.utils.text import smart_split
__all__ = ('Template', 'Context', 'RequestContext', 'compile_string')
@@ -862,7 +862,7 @@
dict = func(*args)
if not getattr(self, 'nodelist', False):
- from django.template.loader import get_template
+ from opal.template.loader import get_template
t = get_template(file_name)
self.nodelist = t.nodelist
return self.nodelist.render(context_class(dict))
@@ -890,5 +890,5 @@
def add_to_builtins(module_name):
builtins.append(get_library(module_name))
-add_to_builtins('django.template.defaulttags')
-add_to_builtins('django.template.defaultfilters')
+add_to_builtins('opal.template.defaulttags')
+add_to_builtins('opal.template.defaultfilters')
Modified: cs/pythia/trunk/opal/template/context.py
===================================================================
--- cs/pythia/trunk/opal/template/context.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/context.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,5 +1,5 @@
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
+from opal.conf import settings
+from opal.core.exceptions import ImproperlyConfigured
_standard_context_processors = None
Modified: cs/pythia/trunk/opal/template/defaultfilters.py
===================================================================
--- cs/pythia/trunk/opal/template/defaultfilters.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/defaultfilters.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
"Default variable filters"
-from django.template import resolve_variable, Library
-from django.conf import settings
-from django.utils.translation import gettext
+from opal.template import resolve_variable, Library
+from opal.conf import settings
+from opal.utils.translation import gettext
import re
import random as random_module
@@ -24,7 +24,7 @@
def fix_ampersands(value):
"Replaces ampersands with ``&`` entities"
- from django.utils.html import fix_ampersands
+ from opal.utils.html import fix_ampersands
return fix_ampersands(value)
def floatformat(text):
@@ -44,7 +44,7 @@
def linenumbers(value):
"Displays text with line numbers"
- from django.utils.html import escape
+ from opal.utils.html import escape
lines = value.split('\n')
# Find the maximum width of the line count, for use with zero padding string format command
width = str(len(str(len(lines))))
@@ -92,7 +92,7 @@
Argument: Number of words to truncate after
"""
- from django.utils.text import truncate_words
+ from opal.utils.text import truncate_words
try:
length = int(arg)
except ValueError: # invalid literal for int()
@@ -112,7 +112,7 @@
def urlize(value):
"Converts URLs in plain text into clickable links"
- from django.utils.html import urlize
+ from opal.utils.html import urlize
return urlize(value, nofollow=True)
def urlizetrunc(value, limit):
@@ -122,7 +122,7 @@
Argument: Length to truncate URLs to.
"""
- from django.utils.html import urlize
+ from opal.utils.html import urlize
return urlize(value, trim_url_limit=int(limit), nofollow=True)
def wordcount(value):
@@ -135,7 +135,7 @@
Argument: number of characters to wrap the text at.
"""
- from django.utils.text import wrap
+ from opal.utils.text import wrap
return wrap(str(value), int(arg))
def ljust(value, arg):
@@ -168,12 +168,12 @@
def escape(value):
"Escapes a string's HTML"
- from django.utils.html import escape
+ from opal.utils.html import escape
return escape(value)
def linebreaks(value):
"Converts newlines into <p> and <br />s"
- from django.utils.html import linebreaks
+ from opal.utils.html import linebreaks
return linebreaks(value)
def linebreaksbr(value):
@@ -192,7 +192,7 @@
def striptags(value):
"Strips all [X]HTML tags"
- from django.utils.html import strip_tags
+ from opal.utils.html import strip_tags
if not isinstance(value, basestring):
value = str(value)
return strip_tags(value)
@@ -329,7 +329,7 @@
def date(value, arg=None):
"Formats a date according to the given format"
- from django.utils.dateformat import format
+ from opal.utils.dateformat import format
if not value:
return ''
if arg is None:
@@ -338,7 +338,7 @@
def time(value, arg=None):
"Formats a time according to the given format"
- from django.utils.dateformat import time_format
+ from opal.utils.dateformat import time_format
if not value:
return ''
if arg is None:
@@ -347,7 +347,7 @@
def timesince(value, arg=None):
'Formats a date as the time since that date (i.e. "4 days, 6 hours")'
- from django.utils.timesince import timesince
+ from opal.utils.timesince import timesince
if not value:
return ''
if arg:
@@ -356,7 +356,7 @@
def timeuntil(value, arg=None):
'Formats a date as the time until that date (i.e. "4 days, 6 hours")'
- from django.utils.timesince import timesince
+ from opal.utils.timesince import timesince
from datetime import datetime
if not value:
return ''
@@ -459,7 +459,7 @@
def phone2numeric(value):
"Takes a phone number and converts it in to its numerical equivalent"
- from django.utils.text import phone2numeric
+ from opal.utils.text import phone2numeric
return phone2numeric(value)
def pprint(value):
Modified: cs/pythia/trunk/opal/template/defaulttags.py
===================================================================
--- cs/pythia/trunk/opal/template/defaulttags.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/defaulttags.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,9 +1,9 @@
"Default tags used by the template system, available to all templates."
-from django.template import Node, NodeList, Template, Context, resolve_variable
-from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END
-from django.template import get_library, Library, InvalidTemplateLibrary
-from django.conf import settings
+from opal.template import Node, NodeList, Template, Context, resolve_variable
+from opal.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END
+from opal.template import get_library, Library, InvalidTemplateLibrary
+from opal.conf import settings
import sys
register = Library()
@@ -270,7 +270,7 @@
def render(self, context):
from datetime import datetime
- from django.utils.dateformat import DateFormat
+ from opal.utils.dateformat import DateFormat
df = DateFormat(datetime.now())
return df.format(self.format_string)
@@ -279,7 +279,7 @@
self.nodelist = nodelist
def render(self, context):
- from django.utils.html import strip_spaces_between_tags
+ from opal.utils.html import strip_spaces_between_tags
return strip_spaces_between_tags(self.nodelist.render(context).strip())
class TemplateTagNode(Node):
@@ -686,7 +686,7 @@
for taglib in bits[1:]:
# add the library to the parser
try:
- lib = get_library("django.templatetags.%s" % taglib.split('.')[-1])
+ lib = get_library("opal.templatetags.%s" % taglib.split('.')[-1])
parser.add_library(lib)
except InvalidTemplateLibrary, e:
raise TemplateSyntaxError, "'%s' is not a valid tag library: %s" % (taglib, e)
Modified: cs/pythia/trunk/opal/template/loader.py
===================================================================
--- cs/pythia/trunk/opal/template/loader.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/loader.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -20,9 +20,9 @@
# Python eggs) sets is_usable to False if the "pkg_resources" module isn't
# installed, because pkg_resources is necessary to read eggs.
-from django.core.exceptions import ImproperlyConfigured
-from django.template import Origin, Template, Context, TemplateDoesNotExist, add_to_builtins
-from django.conf import settings
+from opal.core.exceptions import ImproperlyConfigured
+from opal.template import Origin, Template, Context, TemplateDoesNotExist, add_to_builtins
+from opal.conf import settings
template_source_loaders = None
@@ -113,4 +113,4 @@
# If we get here, none of the templates could be loaded
raise TemplateDoesNotExist, ', '.join(template_name_list)
-add_to_builtins('django.template.loader_tags')
+add_to_builtins('opal.template.loader_tags')
Modified: cs/pythia/trunk/opal/template/loader_tags.py
===================================================================
--- cs/pythia/trunk/opal/template/loader_tags.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/loader_tags.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.template import TemplateSyntaxError, TemplateDoesNotExist, resolve_variable
-from django.template import Library, Node
-from django.template.loader import get_template, get_template_from_string, find_template_source
-from django.conf import settings
+from opal.template import TemplateSyntaxError, TemplateDoesNotExist, resolve_variable
+from opal.template import Library, Node
+from opal.template.loader import get_template, get_template_from_string, find_template_source
+from opal.conf import settings
register = Library()
Modified: cs/pythia/trunk/opal/template/loaders/app_directories.py
===================================================================
--- cs/pythia/trunk/opal/template/loaders/app_directories.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/loaders/app_directories.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
# Wrapper for loading templates from "template" directories in installed app packages.
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-from django.template import TemplateDoesNotExist
+from opal.conf import settings
+from opal.core.exceptions import ImproperlyConfigured
+from opal.template import TemplateDoesNotExist
import os
# At compile time, cache the directories to search.
Modified: cs/pythia/trunk/opal/template/loaders/eggs.py
===================================================================
--- cs/pythia/trunk/opal/template/loaders/eggs.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/loaders/eggs.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -5,8 +5,8 @@
except ImportError:
resource_string = None
-from django.template import TemplateDoesNotExist
-from django.conf import settings
+from opal.template import TemplateDoesNotExist
+from opal.conf import settings
def load_template_source(template_name, template_dirs=None):
"""
Modified: cs/pythia/trunk/opal/template/loaders/filesystem.py
===================================================================
--- cs/pythia/trunk/opal/template/loaders/filesystem.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/template/loaders/filesystem.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
# Wrapper for loading templates from the filesystem.
-from django.conf import settings
-from django.template import TemplateDoesNotExist
+from opal.conf import settings
+from opal.template import TemplateDoesNotExist
import os
def get_template_sources(template_name, template_dirs=None):
Modified: cs/pythia/trunk/opal/templatetags/__init__.py
===================================================================
--- cs/pythia/trunk/opal/templatetags/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/templatetags/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.conf import settings
+from opal.conf import settings
for a in settings.INSTALLED_APPS:
try:
Modified: cs/pythia/trunk/opal/templatetags/i18n.py
===================================================================
--- cs/pythia/trunk/opal/templatetags/i18n.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/templatetags/i18n.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.template import Node, resolve_variable
-from django.template import TemplateSyntaxError, TokenParser, Library
-from django.template import TOKEN_TEXT, TOKEN_VAR
-from django.utils import translation
+from opal.template import Node, resolve_variable
+from opal.template import TemplateSyntaxError, TokenParser, Library
+from opal.template import TOKEN_TEXT, TOKEN_VAR
+from opal.utils import translation
register = Library()
@@ -10,7 +10,7 @@
self.variable = variable
def render(self, context):
- from django.conf import settings
+ from opal.conf import settings
context[self.variable] = [(k, translation.gettext(v)) for k, v in settings.LANGUAGES]
return ''
Modified: cs/pythia/trunk/opal/utils/cache.py
===================================================================
--- cs/pythia/trunk/opal/utils/cache.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/cache.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -18,8 +18,8 @@
"""
import datetime, md5, re
-from django.conf import settings
-from django.core.cache import cache
+from opal.conf import settings
+from opal.core.cache import cache
cc_delim_re = re.compile(r'\s*,\s*')
Modified: cs/pythia/trunk/opal/utils/dateformat.py
===================================================================
--- cs/pythia/trunk/opal/utils/dateformat.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/dateformat.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -11,8 +11,8 @@
>>>
"""
-from django.utils.dates import MONTHS, MONTHS_AP, WEEKDAYS
-from django.utils.tzinfo import LocalTimezone
+from opal.utils.dates import MONTHS, MONTHS_AP, WEEKDAYS
+from opal.utils.tzinfo import LocalTimezone
from calendar import isleap, monthrange
import re, time
Modified: cs/pythia/trunk/opal/utils/dates.py
===================================================================
--- cs/pythia/trunk/opal/utils/dates.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/dates.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"Commonly-used date structures"
-from django.utils.translation import gettext_lazy as _
+from opal.utils.translation import gettext_lazy as _
WEEKDAYS = {
0:_('Monday'), 1:_('Tuesday'), 2:_('Wednesday'), 3:_('Thursday'), 4:_('Friday'),
Modified: cs/pythia/trunk/opal/utils/feedgenerator.py
===================================================================
--- cs/pythia/trunk/opal/utils/feedgenerator.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/feedgenerator.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -18,7 +18,7 @@
http://diveintomark.org/archives/2004/02/04/incompatible-rss
"""
-from django.utils.xmlutils import SimplerXMLGenerator
+from opal.utils.xmlutils import SimplerXMLGenerator
import datetime, re, time
import email.Utils
Modified: cs/pythia/trunk/opal/utils/html.py
===================================================================
--- cs/pythia/trunk/opal/utils/html.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/html.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -93,7 +93,7 @@
* Removes stuff like "<p> </p>", but only if it's at the
bottom of the text.
"""
- from django.utils.text import normalize_newlines
+ from opal.utils.text import normalize_newlines
text = normalize_newlines(text)
text = re.sub(r'<(/?)\s*b\s*>', '<\\1strong>', text)
text = re.sub(r'<(/?)\s*i\s*>', '<\\1em>', text)
Modified: cs/pythia/trunk/opal/utils/simplejson/__init__.py
===================================================================
--- cs/pythia/trunk/opal/utils/simplejson/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/simplejson/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -77,8 +77,8 @@
'JSONDecoder', 'JSONEncoder',
]
-from django.utils.simplejson.decoder import JSONDecoder
-from django.utils.simplejson.encoder import JSONEncoder
+from opal.utils.simplejson.decoder import JSONDecoder
+from opal.utils.simplejson.encoder import JSONEncoder
def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True,
allow_nan=True, cls=None, **kw):
Modified: cs/pythia/trunk/opal/utils/simplejson/decoder.py
===================================================================
--- cs/pythia/trunk/opal/utils/simplejson/decoder.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/simplejson/decoder.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -3,7 +3,7 @@
"""
import re
-from django.utils.simplejson.scanner import Scanner, pattern
+from opal.utils.simplejson.scanner import Scanner, pattern
FLAGS = re.VERBOSE | re.MULTILINE | re.DOTALL
Modified: cs/pythia/trunk/opal/utils/text.py
===================================================================
--- cs/pythia/trunk/opal/utils/text.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/text.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
import re
-from django.conf import settings
+from opal.conf import settings
# Capitalizes the first letter of a string.
capfirst = lambda x: x and x[0].upper() + x[1:]
Modified: cs/pythia/trunk/opal/utils/timesince.py
===================================================================
--- cs/pythia/trunk/opal/utils/timesince.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/timesince.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
import datetime, math, time
-from django.utils.tzinfo import LocalTimezone
-from django.utils.translation import ngettext
+from opal.utils.tzinfo import LocalTimezone
+from opal.utils.translation import ngettext
def timesince(d, now=None):
"""
Modified: cs/pythia/trunk/opal/utils/translation/__init__.py
===================================================================
--- cs/pythia/trunk/opal/utils/translation/__init__.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/translation/__init__.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.conf import settings
+from opal.conf import settings
if settings.USE_I18N:
from trans_real import *
Modified: cs/pythia/trunk/opal/utils/translation/trans_null.py
===================================================================
--- cs/pythia/trunk/opal/utils/translation/trans_null.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/translation/trans_null.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-# These are versions of the functions in django.utils.translation.trans_real
+# These are versions of the functions in opal.utils.translation.trans_real
# that don't actually do anything. This is purely for performance, so that
# settings.USE_I18N = False can use this module rather than trans_real.py.
-from django.conf import settings
+from opal.conf import settings
def ngettext(singular, plural, number):
if number == 1: return singular
Modified: cs/pythia/trunk/opal/utils/translation/trans_real.py
===================================================================
--- cs/pythia/trunk/opal/utils/translation/trans_real.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/utils/translation/trans_real.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -3,7 +3,7 @@
import os, re, sys
import gettext as gettext_module
from cStringIO import StringIO
-from django.utils.functional import lazy
+from opal.utils.functional import lazy
try:
import threading
@@ -52,7 +52,7 @@
Python 2.4. With Python 2.3, use DjangoTranslation23.
"""
def __init__(self, *args, **kw):
- from django.conf import settings
+ from opal.conf import settings
gettext_module.GNUTranslations.__init__(self, *args, **kw)
# Starting with Python 2.4, there's a function to define
# the output charset. Before 2.4, the output charset is
@@ -108,7 +108,7 @@
if t is not None:
return t
- from django.conf import settings
+ from opal.conf import settings
# set up the right translation class
klass = DjangoTranslation
@@ -212,7 +212,7 @@
except AttributeError:
pass
# If we don't have a real translation object, assume it's the default language.
- from django.conf import settings
+ from opal.conf import settings
return settings.LANGUAGE_CODE
def get_language_bidi():
@@ -221,7 +221,7 @@
False = left-to-right layout
True = right-to-left layout
"""
- from django.conf import settings
+ from opal.conf import settings
return get_language() in settings.LANGUAGES_BIDI
def catalog():
@@ -235,7 +235,7 @@
if t is not None:
return t
if _default is None:
- from django.conf import settings
+ from opal.conf import settings
_default = translation(settings.LANGUAGE_CODE)
return _default
@@ -251,7 +251,7 @@
if t is not None:
return t.gettext(message)
if _default is None:
- from django.conf import settings
+ from opal.conf import settings
_default = translation(settings.LANGUAGE_CODE)
return _default.gettext(message)
@@ -273,7 +273,7 @@
if t is not None:
return t.ngettext(singular, plural, number)
if _default is None:
- from django.conf import settings
+ from opal.conf import settings
_default = translation(settings.LANGUAGE_CODE)
return _default.ngettext(singular, plural, number)
@@ -286,7 +286,7 @@
This is used to decide whether a user-provided language is available. This is
only used for language codes from either the cookies or session.
"""
- from django.conf import settings
+ from opal.conf import settings
globalpath = os.path.join(os.path.dirname(sys.modules[settings.__module__].__file__), 'locale')
if gettext_module.find('django', globalpath, [to_locale(lang_code)]) is not None:
return True
@@ -300,7 +300,7 @@
requests a sublanguage where we have a main language, we send out the main language.
"""
global _accepted
- from django.conf import settings
+ from opal.conf import settings
globalpath = os.path.join(os.path.dirname(sys.modules[settings.__module__].__file__), 'locale')
supported = dict(settings.LANGUAGES)
@@ -358,7 +358,7 @@
technical message ID to store date and time formats. If it doesn't contain
one, the formats provided in the settings will be used.
"""
- from django.conf import settings
+ from opal.conf import settings
date_format = _('DATE_FORMAT')
datetime_format = _('DATETIME_FORMAT')
time_format = _('TIME_FORMAT')
@@ -376,7 +376,7 @@
technical message ID to store partial date formats. If it doesn't contain
one, the formats provided in the settings will be used.
"""
- from django.conf import settings
+ from opal.conf import settings
year_month_format = _('YEAR_MONTH_FORMAT')
month_day_format = _('MONTH_DAY_FORMAT')
if year_month_format == 'YEAR_MONTH_FORMAT':
@@ -411,7 +411,7 @@
does so by translating the Django translation tags into standard gettext
function invocations.
"""
- from django.template import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
+ from opal.template import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
out = StringIO()
intrans = False
inplural = False
Modified: cs/pythia/trunk/opal/views/debug.py
===================================================================
--- cs/pythia/trunk/opal/views/debug.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/debug.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.conf import settings
-from django.template import Template, Context, TemplateDoesNotExist
-from django.utils.html import escape
-from django.http import HttpResponseServerError, HttpResponseNotFound
+from opal.conf import settings
+from opal.template import Template, Context, TemplateDoesNotExist
+from opal.utils.html import escape
+from opal.http import HttpResponseServerError, HttpResponseNotFound
import os, re
HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD')
@@ -70,7 +70,7 @@
template_does_not_exist = False
loader_debug_info = None
if issubclass(exc_type, TemplateDoesNotExist):
- from django.template.loader import template_source_loaders
+ from opal.template.loader import template_source_loaders
template_does_not_exist = True
loader_debug_info = []
for loader in template_source_loaders:
Modified: cs/pythia/trunk/opal/views/decorators/cache.py
===================================================================
--- cs/pythia/trunk/opal/views/decorators/cache.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/decorators/cache.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -11,9 +11,9 @@
account on caching -- just like the middleware does.
"""
-from django.utils.decorators import decorator_from_middleware
-from django.utils.cache import patch_cache_control, add_never_cache_headers
-from django.middleware.cache import CacheMiddleware
+from opal.utils.decorators import decorator_from_middleware
+from opal.utils.cache import patch_cache_control, add_never_cache_headers
+from opal.middleware.cache import CacheMiddleware
cache_page = decorator_from_middleware(CacheMiddleware)
Modified: cs/pythia/trunk/opal/views/decorators/gzip.py
===================================================================
--- cs/pythia/trunk/opal/views/decorators/gzip.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/decorators/gzip.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
"Decorator for views that gzips pages if the client supports it."
-from django.utils.decorators import decorator_from_middleware
-from django.middleware.gzip import GZipMiddleware
+from opal.utils.decorators import decorator_from_middleware
+from opal.middleware.gzip import GZipMiddleware
gzip_page = decorator_from_middleware(GZipMiddleware)
Modified: cs/pythia/trunk/opal/views/decorators/http.py
===================================================================
--- cs/pythia/trunk/opal/views/decorators/http.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/decorators/http.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -2,9 +2,9 @@
Decorators for views based on HTTP headers.
"""
-from django.utils.decorators import decorator_from_middleware
-from django.middleware.http import ConditionalGetMiddleware
-from django.http import HttpResponseNotAllowed
+from opal.utils.decorators import decorator_from_middleware
+from opal.middleware.http import ConditionalGetMiddleware
+from opal.http import HttpResponseNotAllowed
conditional_page = decorator_from_middleware(ConditionalGetMiddleware)
@@ -31,4 +31,4 @@
require_GET.__doc__ = "Decorator to require that a view only accept the GET method."
require_POST = require_http_methods(["POST"])
-require_POST.__doc__ = "Decorator to require that a view only accept the POST method."
\ No newline at end of file
+require_POST.__doc__ = "Decorator to require that a view only accept the POST method."
Modified: cs/pythia/trunk/opal/views/decorators/vary.py
===================================================================
--- cs/pythia/trunk/opal/views/decorators/vary.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/decorators/vary.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,4 +1,4 @@
-from django.utils.cache import patch_vary_headers
+from opal.utils.cache import patch_vary_headers
def vary_on_headers(*headers):
"""
Modified: cs/pythia/trunk/opal/views/defaults.py
===================================================================
--- cs/pythia/trunk/opal/views/defaults.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/defaults.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.core.exceptions import ObjectDoesNotExist
-from django.template import Context, RequestContext, loader
-from django.contrib.contenttypes.models import ContentType
-from django.contrib.sites.models import Site
+from opal.core.exceptions import ObjectDoesNotExist
+from opal.template import Context, RequestContext, loader
+from opal.contrib.contenttypes.models import ContentType
+from opal.contrib.sites.models import Site
from django import http
def shortcut(request, content_type_id, object_id):
Modified: cs/pythia/trunk/opal/views/generic/create_update.py
===================================================================
--- cs/pythia/trunk/opal/views/generic/create_update.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/generic/create_update.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,11 +1,11 @@
-from django.core.xheaders import populate_xheaders
-from django.template import loader
+from opal.core.xheaders import populate_xheaders
+from opal.template import loader
from django import forms
-from django.db.models import FileField
-from django.contrib.auth.views import redirect_to_login
-from django.template import RequestContext
-from django.http import Http404, HttpResponse, HttpResponseRedirect
-from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
+from opal.db.models import FileField
+from opal.contrib.auth.views import redirect_to_login
+from opal.template import RequestContext
+from opal.http import Http404, HttpResponse, HttpResponseRedirect
+from opal.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
def create_object(request, model, template_name=None,
template_loader=loader, extra_context=None, post_save_redirect=None,
Modified: cs/pythia/trunk/opal/views/generic/date_based.py
===================================================================
--- cs/pythia/trunk/opal/views/generic/date_based.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/generic/date_based.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
-from django.template import loader, RequestContext
-from django.core.exceptions import ObjectDoesNotExist
-from django.core.xheaders import populate_xheaders
-from django.http import Http404, HttpResponse
+from opal.template import loader, RequestContext
+from opal.core.exceptions import ObjectDoesNotExist
+from opal.core.xheaders import populate_xheaders
+from opal.http import Http404, HttpResponse
import datetime, time
def archive_index(request, queryset, date_field, num_latest=15,
Modified: cs/pythia/trunk/opal/views/generic/list_detail.py
===================================================================
--- cs/pythia/trunk/opal/views/generic/list_detail.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/generic/list_detail.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,8 +1,8 @@
-from django.template import loader, RequestContext
-from django.http import Http404, HttpResponse
-from django.core.xheaders import populate_xheaders
-from django.core.paginator import ObjectPaginator, InvalidPage
-from django.core.exceptions import ObjectDoesNotExist
+from opal.template import loader, RequestContext
+from opal.http import Http404, HttpResponse
+from opal.core.xheaders import populate_xheaders
+from opal.core.paginator import ObjectPaginator, InvalidPage
+from opal.core.exceptions import ObjectDoesNotExist
def object_list(request, queryset, paginate_by=None, page=None,
allow_empty=False, template_name=None, template_loader=loader,
Modified: cs/pythia/trunk/opal/views/generic/simple.py
===================================================================
--- cs/pythia/trunk/opal/views/generic/simple.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/generic/simple.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.shortcuts import render_to_response
-from django.template import RequestContext
-from django.http import HttpResponse, HttpResponsePermanentRedirect, HttpResponseGone
+from opal.shortcuts import render_to_response
+from opal.template import RequestContext
+from opal.http import HttpResponse, HttpResponsePermanentRedirect, HttpResponseGone
def direct_to_template(request, template, **kwargs):
"""
@@ -18,7 +18,7 @@
``/foo/<id>/`` to ``/bar/<id>/``, you could use the following URLconf::
urlpatterns = patterns('',
- ('^foo/(?p<id>\d+)/$', 'django.views.generic.simple.redirect_to', {'url' : '/bar/%(id)s/'}),
+ ('^foo/(?p<id>\d+)/$', 'opal.views.generic.simple.redirect_to', {'url' : '/bar/%(id)s/'}),
)
If the given url is ``None``, a HttpResponseGone (410) will be issued.
Modified: cs/pythia/trunk/opal/views/i18n.py
===================================================================
--- cs/pythia/trunk/opal/views/i18n.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/i18n.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,7 +1,7 @@
from django import http
-from django.utils.translation import check_for_language, activate, to_locale, get_language
-from django.utils.text import javascript_quote
-from django.conf import settings
+from opal.utils.translation import check_for_language, activate, to_locale, get_language
+from opal.utils.text import javascript_quote
+from opal.conf import settings
import os
import gettext as gettext_module
@@ -89,7 +89,7 @@
Receives the list of packages to check for translations in the
packages parameter either from an infodict or as a +-delimited
- string from the request. Default is 'django.conf'.
+ string from the request. Default is 'opal.conf'.
Additionally you can override the gettext domain for this view,
but usually you don't want to do that, as JavaScript messages
@@ -101,10 +101,10 @@
if check_for_language(request.GET['language']):
activate(request.GET['language'])
if packages is None:
- packages = ['django.conf']
+ packages = ['opal.conf']
if type(packages) in (str, unicode):
packages = packages.split('+')
- packages = [p for p in packages if p == 'django.conf' or p in settings.INSTALLED_APPS]
+ packages = [p for p in packages if p == 'opal.conf' or p in settings.INSTALLED_APPS]
default_locale = to_locale(settings.LANGUAGE_CODE)
locale = to_locale(get_language())
t = {}
Modified: cs/pythia/trunk/opal/views/static.py
===================================================================
--- cs/pythia/trunk/opal/views/static.py 2007-03-08 02:59:51 UTC (rev 6189)
+++ cs/pythia/trunk/opal/views/static.py 2007-03-08 05:06:36 UTC (rev 6190)
@@ -1,6 +1,6 @@
-from django.template import loader
-from django.http import Http404, HttpResponse, HttpResponseRedirect, HttpResponseNotModified
-from django.template import Template, Context, TemplateDoesNotExist
+from opal.template import loader
+from opal.http import Http404, HttpResponse, HttpResponseRedirect, HttpResponseNotModified
+from opal.template import Template, Context, TemplateDoesNotExist
import mimetypes
import os
import posixpath
@@ -15,7 +15,7 @@
To use, put a URL pattern such as::
- (r'^(?P<path>.*)$', 'django.views.static.serve', {'document_root' : '/path/to/my/files/'})
+ (r'^(?P<path>.*)$', 'opal.views.static.serve', {'document_root' : '/path/to/my/files/'})
in your URLconf. You must provide the ``document_root`` param. You may
also set ``show_indexes`` to ``True`` if you'd like to serve a basic index
More information about the cig-commits
mailing list