Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a really obnoxious path/namespace problem. Hooray.

Browse source
This commit is contained in:
Greg Taylor 2007-01-02 00:05:29 +00:00
parent 0adfd4d45c
commit c3ce3451b3
9 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/trunk/apps/helpsys/models.py
View file

@ -1,5 +1,5 @@
from django.db import models from django.db import models
import evennia.ansi import ansi
# Create your models here. # Create your models here.
class HelpEntry(models.Model): class HelpEntry(models.Model):

10
evennia/trunk/apps/objects/models.py
View file

@ -1,7 +1,7 @@
from django.db import models from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
import evennia.defines_global as global_defines import defines_global as global_defines
import evennia.ansi import ansi
class Attribute(models.Model): class Attribute(models.Model):
""" """
@ -57,7 +57,7 @@ class Object(models.Model):
) )
class Admin: class Admin:
list_display = ('id', 'name', 'type', 'owner', 'date_created') list_display = ('id', 'name', 'type', 'date_created')
""" """
BEGIN COMMON METHODS BEGIN COMMON METHODS
@ -583,5 +583,5 @@ class Object(models.Model):
def __str__(self): def __str__(self):
return "%s(#%d%s)" % (self.get_ansiname(), self.id, self.flag_string()) return "%s(#%d%s)" % (self.get_ansiname(), self.id, self.flag_string())
import evennia.functions_db import functions_db
import evennia.session_mgr import session_mgr

2
evennia/trunk/commands_general.py
View file

@ -3,7 +3,7 @@ import time
import functions_general import functions_general
import functions_db import functions_db
import functions_help import functions_help
import evennia.defines_global as global_defines import defines_global as global_defines
import session_mgr import session_mgr
import ansi import ansi
import os import os

BIN
evennia/trunk/evennia.sql
View file

Binary file not shown.

4
evennia/trunk/evennia.vhost.apache
View file

@ -24,8 +24,8 @@
<Directory "/home/evennia/evennia"> <Directory "/home/evennia/evennia">
SetHandler python-program SetHandler python-program
PythonHandler django.core.handlers.modpython PythonHandler django.core.handlers.modpython
PythonPath "['/home/evennia'] + sys.path" PythonPath "['/home/evennia/evennia'] + sys.path"
SetEnv DJANGO_SETTINGS_MODULE evennia.settings SetEnv DJANGO_SETTINGS_MODULE settings
PythonDebug On PythonDebug On
</Directory> </Directory>

2
evennia/trunk/functions_db.py
View file

@ -3,7 +3,7 @@ from django.db import connection
from django.contrib.auth.models import User from django.contrib.auth.models import User
from apps.objects.models import Object from apps.objects.models import Object
from apps.config.models import ConfigValue from apps.config.models import ConfigValue
import evennia.defines_global as global_defines import defines_global as global_defines
import gameconf import gameconf
""" """

1
evennia/trunk/prepenv.sh
View file

@ -1,4 +1,3 @@
#!/bin/bash #!/bin/bash
export DJANGO_SETTINGS_MODULE="settings" export DJANGO_SETTINGS_MODULE="settings"
export PYTHONPATH=/home/gtaylor/dev/
python2.5 server.py python2.5 server.py

2
evennia/trunk/server.py
View file

@ -8,7 +8,7 @@ from apps.config.models import CommandAlias
import scheduler import scheduler
import functions_db import functions_db
import functions_general import functions_general
import evennia.defines_global as global_defines import defines_global as global_defines
import session_mgr import session_mgr
import gameconf import gameconf
import settings import settings

8
evennia/trunk/settings.py.dist
View file

@ -61,7 +61,7 @@ MIDDLEWARE_CLASSES = (
'django.middleware.doc.XViewMiddleware', 'django.middleware.doc.XViewMiddleware',
) )
ROOT_URLCONF = 'evennia.urls' ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@ -74,7 +74,7 @@ INSTALLED_APPS = (
'django.contrib.contenttypes', 'django.contrib.contenttypes',
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.admin', 'django.contrib.admin',
'evennia.apps.config', 'apps.config',
'evennia.apps.objects', 'apps.objects',
'evennia.apps.helpsys', 'apps.helpsys',
) )