Many many updates and cleanup for django standardization and 1.9 support

antioch/client/templates/client/login.html

@@ -1,5 +1,4 @@
 {% extends 'base.html' %}
-{% load url from future %}
 {% load staticfiles widget_tweaks %}
 
 {% block header %}

antioch/client/urls.py

@@ -4,14 +4,16 @@
 #
 # See LICENSE for details
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
-urlpatterns = patterns('django.contrib.auth.views',
-	url(r'^login/$', 'login', {'template_name': 'client/login.html'}, name='login'),
-) + patterns('antioch.client.views',
-	url(r'^rest/(.*)$', 'rest', name='rest'),
-	url(r'^comet/$', 'comet', name='comet'),
-	url(r'^logout/$', 'logout', name='logout'),
-	url(r'^$', 'client', name='client'),
-)
+from django.contrib.auth.views import login
+from .views import rest, comet, logout, client
+
+urlpatterns = [
+	url(r'^login/$', login, {'template_name': 'client/login.html'}, name='login'),
+	url(r'^rest/(.*)$', rest, name='rest'),
+	url(r'^comet/$', comet, name='comet'),
+	url(r'^logout/$', logout, name='logout'),
+	url(r'^$', client, name='client'),
+]
 

antioch/client/views.py

@@ -17,9 +17,9 @@
 from django.middleware import csrf
 from django.views.decorators.csrf import csrf_exempt
 
-import simplejson
+import json
 
-from antioch import plugins, assets, celery
+from antioch import plugins, celery
 from antioch.core import parser, tasks
 
 log = logging.getLogger(__name__)
@@ -77,12 +77,12 @@ def rest(request, command):
 	"""
 	Query the appserver and wait for a response.
 	"""
-	kwargs = simplejson.loads(request.read())
+	kwargs = json.loads(request.read())
 
 	task = getattr(tasks, command)
 	result = task.delay(request.user.avatar.id, **kwargs)
 	data = result.get(timeout=settings.JOB_TIMEOUT)
-	response = simplejson.dumps(data)
+	response = json.dumps(data)
 
 	return http.HttpResponse(response, content_type="application/json")
 

antioch/common/templates/base.html

@@ -46,6 +46,7 @@
 
     <script src="{% static 'common/js/libs/less-1.5.0.min.js' %}"></script>
     <script src="{% static 'common/js/libs/bootstrap-3.0.3.min.js' %}"></script>
+    {% include 'autocomplete_light/static.html' %}
     {% block footer %}
     {% endblock %}
   </body>

antioch/core/dbapi.py

@@ -12,7 +12,6 @@
 
 from twisted.enterprise import adbapi
 
-from antioch import conf
 from antioch.util import logs
 
 pools = {}

antioch/core/exchange.py

@@ -14,10 +14,12 @@
 """
 import crypt, string, random, time, logging, collections
 
-from antioch import conf, celery
+from antioch import celery
 from antioch.core import interface, errors
 from antioch.util import sql, json, hash_password
 
+from django.conf import settings
+
 group_definitions = dict(
 	owners		= lambda x,a,s: a.owns(s),
 	wizards		= lambda x,a,s: x.is_wizard(a.get_id()),
@@ -184,7 +186,7 @@ def flush(self):
 					if not(user.is_connected_player()):
 						log.debug("ignoring message for unconnected player %s" % user)
 						continue
-					queue_id = '-'.join([conf.get('user-queue'), str(user.id)])
+					queue_id = '-'.join([settings.USER_QUEUE, str(user.id)])
 					log.debug("flushing message to #%s: %s" % (queue_id, msg))
 					exchange.publish(exchange.Message(json.dumps(msg), content_type="application/json"), routing_key=queue_id)
 

antioch/core/migrations/0001_initial.py

@@ -0,0 +1,208 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2015-12-23 17:50
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Access',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('rule', models.CharField(choices=[(b'allow', b'allow'), (b'deny', b'deny')], max_length=5)),
+                ('type', models.CharField(choices=[(b'accessor', b'accessor'), (b'group', b'group')], max_length=8)),
+                ('group', models.CharField(choices=[(b'everyone', b'everyone'), (b'owners', b'owners'), (b'wizards', b'wizards')], max_length=8, null=True)),
+                ('weight', models.IntegerField(default=0)),
+            ],
+            options={
+                'db_table': 'access',
+                'verbose_name_plural': 'access controls',
+            },
+        ),
+        migrations.CreateModel(
+            name='Alias',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('alias', models.CharField(max_length=255)),
+            ],
+            options={
+                'db_table': 'object_alias',
+                'verbose_name_plural': 'aliases',
+            },
+        ),
+        migrations.CreateModel(
+            name='Object',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('unique_name', models.BooleanField()),
+                ('location', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='contents', to='core.Object')),
+            ],
+            options={
+                'db_table': 'object',
+            },
+        ),
+        migrations.CreateModel(
+            name='Observation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('object', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='observer', to='core.Object')),
+                ('observer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='object', to='core.Object')),
+            ],
+            options={
+                'db_table': 'object_observer',
+            },
+        ),
+        migrations.CreateModel(
+            name='Permission',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+            ],
+            options={
+                'db_table': 'permission',
+            },
+        ),
+        migrations.CreateModel(
+            name='Player',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('session_id', models.CharField(max_length=255, null=True)),
+                ('wizard', models.BooleanField(default=False)),
+                ('enabled', models.BooleanField(default=True)),
+                ('crypt', models.CharField(max_length=255)),
+                ('last_login', models.DateTimeField(null=True)),
+                ('last_logout', models.DateTimeField(null=True)),
+                ('avatar', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.Object')),
+            ],
+            options={
+                'db_table': 'player',
+            },
+        ),
+        migrations.CreateModel(
+            name='Property',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('value', models.TextField(blank=True, null=True)),
+                ('type', models.CharField(choices=[(b'string', b'string'), (b'python', b'python'), (b'dynamic', b'dynamic')], max_length=255)),
+                ('origin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='properties', to='core.Object')),
+                ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.Object')),
+            ],
+            options={
+                'db_table': 'property',
+                'verbose_name_plural': 'properties',
+            },
+        ),
+        migrations.CreateModel(
+            name='Relationship',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('weight', models.IntegerField(default=0)),
+                ('child', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='parent', to='core.Object')),
+                ('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='child', to='core.Object')),
+            ],
+            options={
+                'db_table': 'object_relation',
+            },
+        ),
+        migrations.CreateModel(
+            name='Task',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('verb_name', models.CharField(max_length=255)),
+                ('args', models.TextField()),
+                ('kwargs', models.TextField()),
+                ('created', models.DateTimeField()),
+                ('delay', models.IntegerField()),
+                ('killed', models.BooleanField(default=False)),
+                ('error', models.CharField(blank=True, max_length=255, null=True)),
+                ('trace', models.TextField(blank=True, null=True)),
+                ('origin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='core.Object')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='tasks', to='core.Object')),
+            ],
+            options={
+                'db_table': 'task',
+            },
+        ),
+        migrations.CreateModel(
+            name='Verb',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('code', models.TextField(blank=True, null=True)),
+                ('filename', models.CharField(blank=True, max_length=255, null=True)),
+                ('ability', models.BooleanField()),
+                ('method', models.BooleanField()),
+                ('origin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='verbs', to='core.Object')),
+                ('owner', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.Object')),
+            ],
+            options={
+                'db_table': 'verb',
+            },
+        ),
+        migrations.CreateModel(
+            name='VerbName',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('verb', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='names', to='core.Verb')),
+            ],
+            options={
+                'db_table': 'verb_name',
+            },
+        ),
+        migrations.AddField(
+            model_name='object',
+            name='observers',
+            field=models.ManyToManyField(related_name='observing', through='core.Observation', to='core.Object'),
+        ),
+        migrations.AddField(
+            model_name='object',
+            name='owner',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='core.Object'),
+        ),
+        migrations.AddField(
+            model_name='object',
+            name='parents',
+            field=models.ManyToManyField(related_name='children', through='core.Relationship', to='core.Object'),
+        ),
+        migrations.AddField(
+            model_name='alias',
+            name='object',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='aliases', to='core.Object'),
+        ),
+        migrations.AddField(
+            model_name='access',
+            name='accessor',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='rights', to='core.Object'),
+        ),
+        migrations.AddField(
+            model_name='access',
+            name='object',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='acl', to='core.Object'),
+        ),
+        migrations.AddField(
+            model_name='access',
+            name='permission',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='usage', to='core.Permission'),
+        ),
+        migrations.AddField(
+            model_name='access',
+            name='property',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='acl', to='core.Property'),
+        ),
+        migrations.AddField(
+            model_name='access',
+            name='verb',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='acl', to='core.Verb'),
+        ),
+    ]

antioch/plugins/__init__.py

@@ -39,7 +39,7 @@ def urlconfs():
 		app_label = app.split('.')[-1]
 		p = get_app_submodule(app, submodule='plugin')
 		if(p and get_app_submodule(app, submodule='urls')):
-			urlconf = url(r'', include('%s.urls' % app, app_name=app_label))
+			urlconf = url(r'', include('%s.urls' % app, app_name=app_label, namespace=app_label))
 			result.append(urlconf)
 	return result