Wed Mar 7 22:53:59 PST 2007

Author: leif
Date: 2007-03-07 22:53:57 -0800 (Wed, 07 Mar 2007)
New Revision: 6191

Removed:
   cs/pythia/trunk/opal/scripts/django-admin.py
Modified:
   cs/pythia/trunk/opal/contrib/admin/models.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/log.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/forms.py
   cs/pythia/trunk/opal/contrib/auth/models.py
   cs/pythia/trunk/opal/contrib/auth/views.py
   cs/pythia/trunk/opal/contrib/comments/templatetags/comments.py
   cs/pythia/trunk/opal/contrib/comments/views/comments.py
   cs/pythia/trunk/opal/contrib/contenttypes/models.py
   cs/pythia/trunk/opal/contrib/flatpages/models.py
   cs/pythia/trunk/opal/contrib/humanize/templatetags/humanize.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/models.py
   cs/pythia/trunk/opal/contrib/sites/models.py
   cs/pythia/trunk/opal/core/handlers/base.py
   cs/pythia/trunk/opal/core/handlers/modpython.py
   cs/pythia/trunk/opal/core/handlers/wsgi.py
   cs/pythia/trunk/opal/core/management.py
   cs/pythia/trunk/opal/core/servers/basehttp.py
   cs/pythia/trunk/opal/db/backends/mysql/base.py
   cs/pythia/trunk/opal/db/backends/sqlite3/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/manipulators.py
   cs/pythia/trunk/opal/middleware/common.py
   cs/pythia/trunk/opal/middleware/doc.py
   cs/pythia/trunk/opal/utils/translation/trans_real.py
   cs/pythia/trunk/opal/views/defaults.py
   cs/pythia/trunk/opal/views/generic/create_update.py
   cs/pythia/trunk/opal/views/i18n.py
   cs/pythia/trunk/setup.py
Log:
Performed more global find & replace.  The fork is now fully
functional.  Added 'opal' script.


Modified: cs/pythia/trunk/opal/contrib/admin/models.py
===================================================================

--- cs/pythia/trunk/opal/contrib/admin/models.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/admin/models.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -24,7 +24,7 @@
     class Meta:
         verbose_name = _('log entry')
         verbose_name_plural = _('log entries')
-        db_table = 'django_admin_log'
+        db_table = 'opal_admin_log'
         ordering = ('-action_time',)
 
     def __repr__(self):

Modified: cs/pythia/trunk/opal/contrib/admin/templatetags/admin_modify.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/templatetags/admin_modify.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/admin/templatetags/admin_modify.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,4 +1,4 @@
-from django import template
+from opal import template
 from opal.contrib.admin.views.main import AdminBoundField
 from opal.template import loader
 from opal.utils.text import capfirst

Modified: cs/pythia/trunk/opal/contrib/admin/templatetags/adminapplist.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/templatetags/adminapplist.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/admin/templatetags/adminapplist.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,4 +1,4 @@
-from django import template
+from opal import template
 from opal.db.models import get_models
 
 register = template.Library()

Modified: cs/pythia/trunk/opal/contrib/admin/templatetags/log.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/templatetags/log.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/admin/templatetags/log.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,4 +1,4 @@
-from django import template
+from opal import template
 from opal.contrib.admin.models import LogEntry
 
 register = template.Library()

Modified: cs/pythia/trunk/opal/contrib/admin/views/decorators.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/views/decorators.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/admin/views/decorators.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,4 +1,4 @@
-from django import http, template
+from opal import http, template
 from opal.conf import settings
 from opal.contrib.auth.models import User
 from opal.contrib.auth import authenticate, login

Modified: cs/pythia/trunk/opal/contrib/admin/views/doc.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/views/doc.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/admin/views/doc.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,4 +1,4 @@
-from django import template, templatetags
+from opal import template, templatetags
 from opal.template import RequestContext
 from opal.conf import settings
 from opal.contrib.admin.views.decorators import staff_member_required

Modified: cs/pythia/trunk/opal/contrib/admin/views/main.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/views/main.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/admin/views/main.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,4 +1,4 @@
-from django import forms, template
+from opal import forms, template
 from opal.conf import settings
 from opal.contrib.admin.filterspecs import FilterSpec
 from opal.contrib.admin.views.decorators import staff_member_required

Modified: cs/pythia/trunk/opal/contrib/admin/views/template.py
===================================================================
--- cs/pythia/trunk/opal/contrib/admin/views/template.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/admin/views/template.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,6 +1,6 @@
 from opal.contrib.admin.views.decorators import staff_member_required
 from opal.core import validators
-from django import template, forms
+from opal import template, forms
 from opal.template import loader
 from opal.shortcuts import render_to_response
 from opal.contrib.sites.models import Site

Modified: cs/pythia/trunk/opal/contrib/auth/forms.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/forms.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/auth/forms.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -3,7 +3,7 @@
 from opal.contrib.sites.models import Site
 from opal.template import Context, loader
 from opal.core import validators
-from django import forms
+from opal import forms
 
 class AuthenticationForm(forms.Manipulator):
     """

Modified: cs/pythia/trunk/opal/contrib/auth/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/models.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/auth/models.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -169,7 +169,7 @@
             # The SQL below works out to the following, after DB quoting:
             # cursor.execute("""
             #     SELECT ct."app_label", p."codename"
-            #     FROM "auth_permission" p, "auth_group_permissions" gp, "auth_user_groups" ug, "django_content_type" ct
+            #     FROM "auth_permission" p, "auth_group_permissions" gp, "auth_user_groups" ug, "opal_content_type" ct
             #     WHERE p."id" = gp."permission_id"
             #         AND gp."group_id" = ug."group_id"
             #         AND ct."id" = p."content_type_id"
@@ -183,7 +183,7 @@
                     AND ug.%s = %%s""" % (
                 backend.quote_name('app_label'), backend.quote_name('codename'),
                 backend.quote_name('auth_permission'), backend.quote_name('auth_group_permissions'),
-                backend.quote_name('auth_user_groups'), backend.quote_name('django_content_type'),
+                backend.quote_name('auth_user_groups'), backend.quote_name('opal_content_type'),
                 backend.quote_name('id'), backend.quote_name('permission_id'),
                 backend.quote_name('group_id'), backend.quote_name('group_id'),
                 backend.quote_name('id'), backend.quote_name('content_type_id'),

Modified: cs/pythia/trunk/opal/contrib/auth/views.py
===================================================================
--- cs/pythia/trunk/opal/contrib/auth/views.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/auth/views.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,6 +1,6 @@
 from opal.contrib.auth.forms import AuthenticationForm
 from opal.contrib.auth.forms import PasswordResetForm, PasswordChangeForm
-from django import forms
+from opal import forms
 from opal.shortcuts import render_to_response
 from opal.template import RequestContext
 from opal.contrib.sites.models import Site

Modified: cs/pythia/trunk/opal/contrib/comments/templatetags/comments.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/templatetags/comments.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/comments/templatetags/comments.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,7 +1,7 @@
 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 opal import template
 from opal.template import loader
 from opal.core.exceptions import ObjectDoesNotExist
 from opal.contrib.contenttypes.models import ContentType

Modified: cs/pythia/trunk/opal/contrib/comments/views/comments.py
===================================================================
--- cs/pythia/trunk/opal/contrib/comments/views/comments.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/comments/views/comments.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,5 +1,5 @@
 from opal.core import validators
-from django import forms
+from opal import forms
 from opal.core.mail import mail_admins, mail_managers
 from opal.http import Http404
 from opal.core.exceptions import ObjectDoesNotExist

Modified: cs/pythia/trunk/opal/contrib/contenttypes/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/contenttypes/models.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/contenttypes/models.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -22,7 +22,7 @@
     class Meta:
         verbose_name = _('content type')
         verbose_name_plural = _('content types')
-        db_table = 'django_content_type'
+        db_table = 'opal_content_type'
         ordering = ('name',)
         unique_together = (('app_label', 'model'),)
 

Modified: cs/pythia/trunk/opal/contrib/flatpages/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/flatpages/models.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/flatpages/models.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -14,7 +14,7 @@
     registration_required = models.BooleanField(_('registration required'), help_text=_("If this is checked, only logged-in users will be able to view the page."))
     sites = models.ManyToManyField(Site)
     class Meta:
-        db_table = 'django_flatpage'
+        db_table = 'opal_flatpage'
         verbose_name = _('flat page')
         verbose_name_plural = _('flat pages')
         ordering = ('url',)

Modified: cs/pythia/trunk/opal/contrib/humanize/templatetags/humanize.py
===================================================================
--- cs/pythia/trunk/opal/contrib/humanize/templatetags/humanize.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/humanize/templatetags/humanize.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,4 +1,4 @@
-from django import template
+from opal import template
 import re
 
 register = template.Library()

Modified: cs/pythia/trunk/opal/contrib/markup/templatetags/markup.py
===================================================================
--- cs/pythia/trunk/opal/contrib/markup/templatetags/markup.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/markup/templatetags/markup.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -14,7 +14,7 @@
 silently fail and return the un-marked-up text.
 """
 
-from django import template
+from opal import template
 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 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/redirects/middleware.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,5 +1,5 @@
 from opal.contrib.redirects.models import Redirect
-from django import http
+from opal import http
 from opal.conf import settings
 
 class RedirectFallbackMiddleware(object):

Modified: cs/pythia/trunk/opal/contrib/redirects/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/redirects/models.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/redirects/models.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -12,7 +12,7 @@
     class Meta:
         verbose_name = _('redirect')
         verbose_name_plural = _('redirects')
-        db_table = 'django_redirect'
+        db_table = 'opal_redirect'
         unique_together=(('site', 'old_path'),)
         ordering = ('old_path',)
 

Modified: cs/pythia/trunk/opal/contrib/sessions/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/sessions/models.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/sessions/models.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -53,7 +53,7 @@
     expire_date = models.DateTimeField(_('expire date'))
     objects = SessionManager()
     class Meta:
-        db_table = 'django_session'
+        db_table = 'opal_session'
         verbose_name = _('session')
         verbose_name_plural = _('sessions')
 

Modified: cs/pythia/trunk/opal/contrib/sites/models.py
===================================================================
--- cs/pythia/trunk/opal/contrib/sites/models.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/contrib/sites/models.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -11,7 +11,7 @@
     name = models.CharField(_('display name'), maxlength=50)
     objects = SiteManager()
     class Meta:
-        db_table = 'django_site'
+        db_table = 'opal_site'
         verbose_name = _('site')
         verbose_name_plural = _('sites')
         ordering = ('domain',)

Modified: cs/pythia/trunk/opal/core/handlers/base.py
===================================================================
--- cs/pythia/trunk/opal/core/handlers/base.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/core/handlers/base.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,6 +1,6 @@
 from opal.core import signals
 from opal.dispatch import dispatcher
-from django import http
+from opal import http
 import sys
 
 class BaseHandler(object):

Modified: cs/pythia/trunk/opal/core/handlers/modpython.py
===================================================================
--- cs/pythia/trunk/opal/core/handlers/modpython.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/core/handlers/modpython.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -2,7 +2,7 @@
 from opal.core import signals
 from opal.dispatch import dispatcher
 from opal.utils import datastructures
-from django import http
+from opal import http
 from pprint import pformat
 import os
 

Modified: cs/pythia/trunk/opal/core/handlers/wsgi.py
===================================================================
--- cs/pythia/trunk/opal/core/handlers/wsgi.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/core/handlers/wsgi.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -2,7 +2,7 @@
 from opal.core import signals
 from opal.dispatch import dispatcher
 from opal.utils import datastructures
-from django import http
+from opal import http
 from pprint import pformat
 
 # See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html

Modified: cs/pythia/trunk/opal/core/management.py
===================================================================
--- cs/pythia/trunk/opal/core/management.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/core/management.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,7 +1,7 @@
 # Django management-related functions, including "CREATE TABLE" generation and
 # development-server initialization.
 
-import django
+import opal
 from opal.core.exceptions import ImproperlyConfigured
 import os, re, shutil, sys, textwrap
 from optparse import OptionParser
@@ -75,11 +75,7 @@
 
 def get_version():
     "Returns the version as a human-format string."
-    from django import VERSION
-    v = '.'.join([str(i) for i in VERSION[:-1]])
-    if VERSION[-1]:
-        v += '-' + VERSION[-1]
-    return v
+    return "0.8.1"
 
 def get_sql_create(app):
     "Returns a list of the CREATE TABLE SQL statements for the given app."

Modified: cs/pythia/trunk/opal/core/servers/basehttp.py
===================================================================
--- cs/pythia/trunk/opal/core/servers/basehttp.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/core/servers/basehttp.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -600,7 +600,7 @@
     """
     def __init__(self, application):
         from opal.conf import settings
-        import django
+        import opal
         self.application = application
         self.media_dir = opal.__path__[0] + '/contrib/admin/media'
         self.media_url = settings.ADMIN_MEDIA_PREFIX

Modified: cs/pythia/trunk/opal/db/backends/mysql/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/mysql/base.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/db/backends/mysql/base.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -16,8 +16,8 @@
 
 DatabaseError = Database.DatabaseError
 
-django_conversions = conversions.copy()
-django_conversions.update({
+opal_conversions = conversions.copy()
+opal_conversions.update({
     types.BooleanType: util.rev_typecast_boolean,
     FIELD_TYPE.DATETIME: util.typecast_timestamp,
     FIELD_TYPE.DATE: util.typecast_date,
@@ -79,7 +79,7 @@
                 'user': settings.DATABASE_USER,
                 'db': settings.DATABASE_NAME,
                 'passwd': settings.DATABASE_PASSWORD,
-                'conv': django_conversions,
+                'conv': opal_conversions,
             }
             if settings.DATABASE_HOST.startswith('/'):
                 kwargs['unix_socket'] = settings.DATABASE_HOST

Modified: cs/pythia/trunk/opal/db/backends/sqlite3/base.py
===================================================================
--- cs/pythia/trunk/opal/db/backends/sqlite3/base.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/db/backends/sqlite3/base.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -45,8 +45,8 @@
                 detect_types=Database.PARSE_DECLTYPES | Database.PARSE_COLNAMES)
 
             # Register extract and date_trunc functions.
-            self.connection.create_function("django_extract", 2, _sqlite_extract)
-            self.connection.create_function("django_date_trunc", 2, _sqlite_date_trunc)
+            self.connection.create_function("opal_extract", 2, _sqlite_extract)
+            self.connection.create_function("opal_date_trunc", 2, _sqlite_date_trunc)
         cursor = self.connection.cursor(factory=SQLiteCursorWrapper)
         cursor.row_factory = utf8rowFactory
         if settings.DEBUG:
@@ -101,7 +101,7 @@
     # lookup_type is 'year', 'month', 'day'
     # sqlite doesn't support extract, so we fake it with the user-defined
     # function _sqlite_extract that's registered in connect(), above.
-    return 'django_extract("%s", %s)' % (lookup_type.lower(), table_name)
+    return 'opal_extract("%s", %s)' % (lookup_type.lower(), table_name)
 
 def _sqlite_extract(lookup_type, dt):
     try:
@@ -113,7 +113,7 @@
 def get_date_trunc_sql(lookup_type, field_name):
     # lookup_type is 'year', 'month', 'day'
     # sqlite doesn't support DATE_TRUNC, so we fake it as above.
-    return 'django_date_trunc("%s", %s)' % (lookup_type.lower(), field_name)
+    return 'opal_date_trunc("%s", %s)' % (lookup_type.lower(), field_name)
 
 def get_limit_offset_sql(limit, offset=None):
     sql = "LIMIT %s" % limit

Modified: cs/pythia/trunk/opal/db/models/fields/__init__.py
===================================================================
--- cs/pythia/trunk/opal/db/models/fields/__init__.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/db/models/fields/__init__.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -2,7 +2,7 @@
 from opal.dispatch import dispatcher
 from opal.conf import settings
 from opal.core import validators
-from django import forms
+from opal import forms
 from opal.core.exceptions import ObjectDoesNotExist
 from opal.utils.functional import curry
 from opal.utils.text import capfirst

Modified: cs/pythia/trunk/opal/db/models/fields/generic.py
===================================================================
--- cs/pythia/trunk/opal/db/models/fields/generic.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/db/models/fields/generic.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -2,7 +2,7 @@
 Classes allowing "generic" relations through ContentType and object-id fields.
 """
 
-from django import forms
+from opal import forms
 from opal.core.exceptions import ObjectDoesNotExist
 from opal.db import backend
 from opal.db.models import signals

Modified: cs/pythia/trunk/opal/db/models/fields/related.py
===================================================================
--- cs/pythia/trunk/opal/db/models/fields/related.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/db/models/fields/related.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -5,7 +5,7 @@
 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 opal import forms
 from opal.dispatch import dispatcher
 
 # For Python 2.3

Modified: cs/pythia/trunk/opal/db/models/manipulators.py
===================================================================
--- cs/pythia/trunk/opal/db/models/manipulators.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/db/models/manipulators.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,5 +1,5 @@
 from opal.core.exceptions import ObjectDoesNotExist
-from django import forms
+from opal import forms
 from opal.core import validators
 from opal.db.models.fields import FileField, AutoField
 from opal.dispatch import dispatcher

Modified: cs/pythia/trunk/opal/middleware/common.py
===================================================================
--- cs/pythia/trunk/opal/middleware/common.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/middleware/common.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,5 +1,5 @@
 from opal.conf import settings
-from django import http
+from opal import http
 from opal.core.mail import mail_managers
 import md5
 

Modified: cs/pythia/trunk/opal/middleware/doc.py
===================================================================
--- cs/pythia/trunk/opal/middleware/doc.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/middleware/doc.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,5 +1,5 @@
 from opal.conf import settings
-from django import http
+from opal import http
 
 class XViewMiddleware(object):
     """

Deleted: cs/pythia/trunk/opal/scripts/django-admin.py
===================================================================
--- cs/pythia/trunk/opal/scripts/django-admin.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/scripts/django-admin.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-from opal.core import management
-
-if __name__ == "__main__":
-    management.execute_from_command_line()

Modified: cs/pythia/trunk/opal/utils/translation/trans_real.py
===================================================================
--- cs/pythia/trunk/opal/utils/translation/trans_real.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/utils/translation/trans_real.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -61,7 +61,7 @@
             self.set_output_charset(settings.DEFAULT_CHARSET)
         except AttributeError:
             pass
-        self.django_output_charset = settings.DEFAULT_CHARSET
+        self.opal_output_charset = settings.DEFAULT_CHARSET
         self.__language = '??'
 
     def merge(self, other):
@@ -87,11 +87,11 @@
     """
     def gettext(self, msgid):
         res = self.ugettext(msgid)
-        return res.encode(self.django_output_charset)
+        return res.encode(self.opal_output_charset)
 
     def ngettext(self, msgid1, msgid2, n):
         res = self.ungettext(msgid1, msgid2, n)
-        return res.encode(self.django_output_charset)
+        return res.encode(self.opal_output_charset)
 
 def translation(language):
     """
@@ -305,11 +305,11 @@
     supported = dict(settings.LANGUAGES)
 
     if hasattr(request, 'session'):
-        lang_code = request.session.get('django_language', None)
+        lang_code = request.session.get('opal_language', None)
         if lang_code in supported and lang_code is not None and check_for_language(lang_code):
             return lang_code
 
-    lang_code = request.COOKIES.get('django_language', None)
+    lang_code = request.COOKIES.get('opal_language', None)
     if lang_code in supported and lang_code is not None and check_for_language(lang_code):
         return lang_code
 

Modified: cs/pythia/trunk/opal/views/defaults.py
===================================================================
--- cs/pythia/trunk/opal/views/defaults.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/views/defaults.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -2,7 +2,7 @@
 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
+from opal import http
 
 def shortcut(request, content_type_id, object_id):
     "Redirect to an object's page based on a content-type ID and an object ID."

Modified: cs/pythia/trunk/opal/views/generic/create_update.py
===================================================================
--- cs/pythia/trunk/opal/views/generic/create_update.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/views/generic/create_update.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,6 +1,6 @@
 from opal.core.xheaders import populate_xheaders
 from opal.template import loader
-from django import forms
+from opal import forms
 from opal.db.models import FileField
 from opal.contrib.auth.views import redirect_to_login
 from opal.template import RequestContext

Modified: cs/pythia/trunk/opal/views/i18n.py
===================================================================
--- cs/pythia/trunk/opal/views/i18n.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/opal/views/i18n.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -1,4 +1,4 @@
-from django import http
+from opal import http
 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
@@ -20,9 +20,9 @@
     response = http.HttpResponseRedirect(next)
     if check_for_language(lang_code):
         if hasattr(request, 'session'):
-            request.session['django_language'] = lang_code
+            request.session['opal_language'] = lang_code
         else:
-            response.set_cookie('django_language', lang_code)
+            response.set_cookie('opal_language', lang_code)
     return response
 
 NullSource = """

Modified: cs/pythia/trunk/setup.py
===================================================================
--- cs/pythia/trunk/setup.py	2007-03-08 05:06:36 UTC (rev 6190)
+++ cs/pythia/trunk/setup.py	2007-03-08 06:53:57 UTC (rev 6191)
@@ -13,9 +13,15 @@
     packages = find_packages(),
     # include everything under version control
     include_package_data = True,
+
+    entry_points = {
+        'console_scripts': [
+            'opal = opal.core.management:execute_from_command_line [opal]',
+        ],
+    },
     
     install_requires = [
-    'Cheetah',
+        'Cheetah',
     ],
 
     extras_require = {
@@ -37,7 +43,6 @@
     'pulse':    [],
     'rigid':    [],
     
-    # Standalone, but might depend upon Django someday :-)
     'opal':    [],
     },
     

