From c3ce3451b388a96a40ad4f45337e1015fc06e4cd Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Tue, 2 Jan 2007 00:05:29 +0000
Subject: [PATCH] Fixed a really obnoxious path/namespace problem. Hooray.

---
 evennia/trunk/apps/helpsys/models.py |   2 +-
 evennia/trunk/apps/objects/models.py |  10 +++++-----
 evennia/trunk/commands_general.py    |   2 +-
 evennia/trunk/evennia.sql            | Bin 48128 -> 48128 bytes
 evennia/trunk/evennia.vhost.apache   |   4 ++--
 evennia/trunk/functions_db.py        |   2 +-
 evennia/trunk/prepenv.sh             |   1 -
 evennia/trunk/server.py              |   2 +-
 evennia/trunk/settings.py.dist       |   8 ++++----
 9 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/evennia/trunk/apps/helpsys/models.py b/evennia/trunk/apps/helpsys/models.py
index 5b0643451e..0ee9414364 100644
--- a/evennia/trunk/apps/helpsys/models.py
+++ b/evennia/trunk/apps/helpsys/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-import evennia.ansi
+import ansi
 
 # Create your models here.
 class HelpEntry(models.Model):
diff --git a/evennia/trunk/apps/objects/models.py b/evennia/trunk/apps/objects/models.py
index 3c17f36141..9d71681255 100755
--- a/evennia/trunk/apps/objects/models.py
+++ b/evennia/trunk/apps/objects/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.contrib.auth.models import User
-import evennia.defines_global as global_defines
-import evennia.ansi
+import defines_global as global_defines
+import ansi
 
 class Attribute(models.Model):
    """
@@ -57,7 +57,7 @@ class Object(models.Model):
       )
    
    class Admin:
-      list_display = ('id', 'name', 'type', 'owner', 'date_created')
+      list_display = ('id', 'name', 'type', 'date_created')
    
    """
    BEGIN COMMON METHODS
@@ -583,5 +583,5 @@ class Object(models.Model):
    def __str__(self):
       return "%s(#%d%s)" % (self.get_ansiname(), self.id, self.flag_string())
 
-import evennia.functions_db
-import evennia.session_mgr
+import functions_db
+import session_mgr
diff --git a/evennia/trunk/commands_general.py b/evennia/trunk/commands_general.py
index ad476122f7..8bd411eb9c 100644
--- a/evennia/trunk/commands_general.py
+++ b/evennia/trunk/commands_general.py
@@ -3,7 +3,7 @@ import time
 import functions_general
 import functions_db
 import functions_help
-import evennia.defines_global as global_defines
+import defines_global as global_defines
 import session_mgr
 import ansi
 import os
diff --git a/evennia/trunk/evennia.sql b/evennia/trunk/evennia.sql
index 2dee0e83585707e9faad56977a9839b8a8b60d78..476806277b073bc2e550ca97b22bfc4ba2ae05b1 100755
GIT binary patch
delta 14
WcmZqp!PM}BX@WH4#f>sgb^`!0^9J4k

delta 14
WcmZqp!PM}BX@WH4`HeD9b^`!0=?2^Y

diff --git a/evennia/trunk/evennia.vhost.apache b/evennia/trunk/evennia.vhost.apache
index 3076fad459..34febbce08 100755
--- a/evennia/trunk/evennia.vhost.apache
+++ b/evennia/trunk/evennia.vhost.apache
@@ -24,8 +24,8 @@
         <Directory "/home/evennia/evennia">
                 SetHandler python-program
                 PythonHandler django.core.handlers.modpython
-                PythonPath "['/home/evennia'] + sys.path"
-                SetEnv DJANGO_SETTINGS_MODULE evennia.settings
+                PythonPath "['/home/evennia/evennia'] + sys.path"
+                SetEnv DJANGO_SETTINGS_MODULE settings
                 PythonDebug On
         </Directory>
 
diff --git a/evennia/trunk/functions_db.py b/evennia/trunk/functions_db.py
index 0d49d5b665..4c81446a05 100644
--- a/evennia/trunk/functions_db.py
+++ b/evennia/trunk/functions_db.py
@@ -3,7 +3,7 @@ from django.db import connection
 from django.contrib.auth.models import User
 from apps.objects.models import Object
 from apps.config.models import ConfigValue
-import evennia.defines_global as global_defines
+import defines_global as global_defines
 import gameconf
 
 """
diff --git a/evennia/trunk/prepenv.sh b/evennia/trunk/prepenv.sh
index 7188e58fa7..dad150ed80 100755
--- a/evennia/trunk/prepenv.sh
+++ b/evennia/trunk/prepenv.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 export DJANGO_SETTINGS_MODULE="settings"
-export PYTHONPATH=/home/gtaylor/dev/
 python2.5 server.py
diff --git a/evennia/trunk/server.py b/evennia/trunk/server.py
index bffb33e701..4ee4a42261 100755
--- a/evennia/trunk/server.py
+++ b/evennia/trunk/server.py
@@ -8,7 +8,7 @@ from apps.config.models import CommandAlias
 import scheduler
 import functions_db
 import functions_general
-import evennia.defines_global as global_defines
+import defines_global as global_defines
 import session_mgr
 import gameconf
 import settings
diff --git a/evennia/trunk/settings.py.dist b/evennia/trunk/settings.py.dist
index 2e724ed4aa..5961223f00 100755
--- a/evennia/trunk/settings.py.dist
+++ b/evennia/trunk/settings.py.dist
@@ -61,7 +61,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.doc.XViewMiddleware',
 )
 
-ROOT_URLCONF = 'evennia.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@ -74,7 +74,7 @@ INSTALLED_APPS = (
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.admin',
-    'evennia.apps.config',
-    'evennia.apps.objects',
-    'evennia.apps.helpsys',
+    'apps.config',
+    'apps.objects',
+    'apps.helpsys',
 )