Moving to django 1.8

README.md

-nnmon the bugtracker for teh internetz
-======================================
-
-nnmon is the project running [respectmynet.eu](http://respectmynet.eu/).
-
-Installation
-------------
-
-See [/docs/SETUP.md](nnmon/blob/master/docs/SETUP.md)
-

babel.cfg

-[extractors]
-django = babeldjango.extract:extract_django
-
-[django: templates/*.*]
-[django: templates/comments/*.*]
-[python: bt/**.py]

bt/migrations/0001_initial.py

 # -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Violation'
-        db.create_table('bt_violation', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('country', self.gf('django.db.models.fields.CharField')(max_length=2)),
-            ('operator', self.gf('django.db.models.fields.CharField')(max_length=256)),
-            ('contract', self.gf('django.db.models.fields.CharField')(max_length=256, blank=True)),
-            ('resource', self.gf('django.db.models.fields.CharField')(max_length=20, blank=True)),
-            ('resource_name', self.gf('django.db.models.fields.CharField')(max_length=4096, blank=True)),
-            ('type', self.gf('django.db.models.fields.CharField')(max_length=20, blank=True)),
-            ('media', self.gf('django.db.models.fields.CharField')(max_length=20, blank=True)),
-            ('temporary', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('contractual', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('contract_excerpt', self.gf('django.db.models.fields.TextField')(blank=True)),
-            ('loophole', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('activationid', self.gf('django.db.models.fields.CharField')(max_length=128, blank=True)),
-            ('state', self.gf('django.db.models.fields.CharField')(default='new', max_length=20, blank=True)),
-            ('editorial', self.gf('django.db.models.fields.TextField')(blank=True)),
-        ))
-        db.send_create_signal('bt', ['Violation'])
-
-        # Adding model 'Comment'
-        db.create_table('bt_comment', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('submitter_email', self.gf('django.db.models.fields.EmailField')(max_length=75)),
-            ('submitter_name', self.gf('django.db.models.fields.CharField')(max_length=20)),
-            ('consent', self.gf('django.db.models.fields.BooleanField')(default=False)),
-            ('comment', self.gf('django.db.models.fields.TextField')()),
-            ('timestamp', self.gf('django.db.models.fields.DateTimeField')()),
-            ('violation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['bt.Violation'])),
-        ))
-        db.send_create_signal('bt', ['Comment'])
-
-        # Adding model 'Attachment'
-        db.create_table('bt_attachment', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('storage', self.gf('django.db.models.fields.files.FileField')(max_length=100)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=512)),
-            ('type', self.gf('django.db.models.fields.CharField')(max_length=512)),
-            ('comment', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['bt.Comment'])),
-        ))
-        db.send_create_signal('bt', ['Attachment'])
-
-        # Adding model 'Confirmation'
-        db.create_table('bt_confirmation', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('key', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)),
-            ('email', self.gf('django.db.models.fields.EmailField')(max_length=75)),
-            ('violation', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['bt.Violation'])),
-        ))
-        db.send_create_signal('bt', ['Confirmation'])
-
-        # Adding model 'FeaturedCase'
-        db.create_table('bt_featuredcase', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('case', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['bt.Violation'], unique=True)),
-        ))
-        db.send_create_signal('bt', ['FeaturedCase'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Violation'
-        db.delete_table('bt_violation')
-
-        # Deleting model 'Comment'
-        db.delete_table('bt_comment')
-
-        # Deleting model 'Attachment'
-        db.delete_table('bt_attachment')
-
-        # Deleting model 'Confirmation'
-        db.delete_table('bt_confirmation')
-
-        # Deleting model 'FeaturedCase'
-        db.delete_table('bt_featuredcase')
-
-
-    models = {
-        'bt.attachment': {
-            'Meta': {'object_name': 'Attachment'},
-            'comment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Comment']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'storage': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'bt.comment': {
-            'Meta': {'object_name': 'Comment'},
-            'comment': ('django.db.models.fields.TextField', [], {}),
-            'consent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'submitter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'submitter_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
-            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
-            'violation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Violation']"})
-        },
-        'bt.confirmation': {
-            'Meta': {'object_name': 'Confirmation'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'violation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Violation']"})
-        },
-        'bt.featuredcase': {
-            'Meta': {'object_name': 'FeaturedCase'},
-            'case': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['bt.Violation']", 'unique': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'bt.violation': {
-            'Meta': {'object_name': 'Violation'},
-            'activationid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
-            'contract': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
-            'contract_excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'contractual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '2'}),
-            'editorial': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'loophole': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'media': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
-            'operator': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
-            'resource': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
-            'resource_name': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'new'", 'max_length': '20', 'blank': 'True'}),
-            'temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['bt']
\ No newline at end of file
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Attachment',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('storage', models.FileField(upload_to=b'static')),
+                ('name', models.CharField(max_length=512)),
+                ('type', models.CharField(max_length=512)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Comment',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('submitter_email', models.EmailField(max_length=254)),
+                ('submitter_name', models.CharField(max_length=20)),
+                ('consent', models.BooleanField()),
+                ('comment', models.TextField()),
+                ('timestamp', models.DateTimeField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Confirmation',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('key', models.CharField(max_length=64, blank=True)),
+                ('email', models.EmailField(max_length=254)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='FeaturedCase',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Operator',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=256)),
+                ('logo', models.ImageField(null=True, upload_to=b'operator_logo', blank=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Violation',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('country', models.CharField(max_length=2, choices=[(b'BE', 'Belgium'), (b'BG', 'Bulgaria'), (b'CZ', 'Czech Republic'), (b'DK', 'Denmark'), (b'DE', 'Germany'), (b'EE', 'Estonia'), (b'IE', 'Ireland'), (b'EL', 'Greece'), (b'ES', 'Spain'), (b'FR', 'France'), (b'IS', 'Iceland'), (b'IT', 'Italy'), (b'CY', 'Cyprus'), (b'LV', 'Latvia'), (b'LT', 'Lithuania'), (b'LU', 'Luxembourg'), (b'HU', 'Hungary'), (b'MT', 'Malta'), (b'NL', 'Netherlands'), (b'NO', 'Norway'), (b'AT', 'Austria'), (b'PL', 'Poland'), (b'PT', 'Portugal'), (b'RO', 'Romania'), (b'SI', 'Slovenia'), (b'SK', 'Slovakia'), (b'FI', 'Finland'), (b'SE', 'Sweden'), (b'UK', 'United Kingdom')])),
+                ('contract', models.CharField(max_length=256, blank=True)),
+                ('resource', models.CharField(blank=True, max_length=20, choices=[(b'port', 'port'), (b'protocol', 'protocol'), (b'service', 'service'), (b'site', 'site'), (b'user', 'user'), (b'ip', 'ip')])),
+                ('resource_name', models.CharField(max_length=4096, blank=True)),
+                ('type', models.CharField(blank=True, max_length=20, choices=[(b'blocking', 'Blocking'), (b'throttling', 'Throttling')])),
+                ('media', models.CharField(blank=True, max_length=20, choices=[(b'fixed', 'Fixed'), (b'mobile', 'Mobile')])),
+                ('temporary', models.BooleanField()),
+                ('contractual', models.BooleanField()),
+                ('contract_excerpt', models.TextField(blank=True)),
+                ('loophole', models.BooleanField()),
+                ('activationid', models.CharField(max_length=128, blank=True)),
+                ('state', models.CharField(default=b'new', max_length=20, blank=True, choices=[(b'moreinfo', 'Need more info'), (b'new', 'New'), (b'verified', 'Verified'), (b'duplicate', 'Duplicate'), (b'ooscope', 'Out of scope'), (b'closed', 'Closed')])),
+                ('editorial', models.TextField(blank=True)),
+                ('operator_ref', models.ForeignKey(related_name='violations', to='bt.Operator')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='featuredcase',
+            name='case',
+            field=models.OneToOneField(to='bt.Violation'),
+        ),
+        migrations.AddField(
+            model_name='confirmation',
+            name='violation',
+            field=models.ForeignKey(to='bt.Violation'),
+        ),
+        migrations.AddField(
+            model_name='comment',
+            name='violation',
+            field=models.ForeignKey(to='bt.Violation'),
+        ),
+        migrations.AddField(
+            model_name='attachment',
+            name='comment',
+            field=models.ForeignKey(to='bt.Comment'),
+        ),
+    ]

bt/migrations/0002_auto__add_operator__add_field_violation_operator_ref.py

-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Operator'
-        db.create_table('bt_operator', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=256)),
-            ('logo', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True, blank=True)),
-        ))
-        db.send_create_signal('bt', ['Operator'])
-
-        # Adding field 'Violation.operator_ref'
-        db.add_column('bt_violation', 'operator_ref',
-                      self.gf('django.db.models.fields.related.ForeignKey')(related_name='violations', null=True, to=orm['bt.Operator']),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting model 'Operator'
-        db.delete_table('bt_operator')
-
-        # Deleting field 'Violation.operator_ref'
-        db.delete_column('bt_violation', 'operator_ref_id')
-
-
-    models = {
-        'bt.attachment': {
-            'Meta': {'object_name': 'Attachment'},
-            'comment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Comment']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'storage': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'bt.comment': {
-            'Meta': {'object_name': 'Comment'},
-            'comment': ('django.db.models.fields.TextField', [], {}),
-            'consent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'submitter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'submitter_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
-            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
-            'violation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Violation']"})
-        },
-        'bt.confirmation': {
-            'Meta': {'object_name': 'Confirmation'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'violation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Violation']"})
-        },
-        'bt.featuredcase': {
-            'Meta': {'object_name': 'FeaturedCase'},
-            'case': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['bt.Violation']", 'unique': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'bt.operator': {
-            'Meta': {'object_name': 'Operator'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'bt.violation': {
-            'Meta': {'object_name': 'Violation'},
-            'activationid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
-            'contract': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
-            'contract_excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'contractual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '2'}),
-            'editorial': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'loophole': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'media': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
-            'operator': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
-            'operator_ref': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'violations'", 'null': 'True', 'to': "orm['bt.Operator']"}),
-            'resource': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
-            'resource_name': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'new'", 'max_length': '20', 'blank': 'True'}),
-            'temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['bt']
\ No newline at end of file

bt/migrations/0003_operator_data.py

-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        "Populate new operator foreign key field"
-        for violation in orm['bt.Violation'].objects.all():
-            operator, created = orm['bt.Operator'].objects.get_or_create(name=violation.operator)
-            violation.operator_ref = operator
-            violation.save()
-
-    def backwards(self, orm):
-        "No need for backward pass"
-        pass
-
-    models = {
-        'bt.attachment': {
-            'Meta': {'object_name': 'Attachment'},
-            'comment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Comment']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'storage': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'bt.comment': {
-            'Meta': {'object_name': 'Comment'},
-            'comment': ('django.db.models.fields.TextField', [], {}),
-            'consent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'submitter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'submitter_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
-            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
-            'violation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Violation']"})
-        },
-        'bt.confirmation': {
-            'Meta': {'object_name': 'Confirmation'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'violation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Violation']"})
-        },
-        'bt.featuredcase': {
-            'Meta': {'object_name': 'FeaturedCase'},
-            'case': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['bt.Violation']", 'unique': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'bt.operator': {
-            'Meta': {'object_name': 'Operator'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'bt.violation': {
-            'Meta': {'object_name': 'Violation'},
-            'activationid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
-            'contract': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
-            'contract_excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'contractual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '2'}),
-            'editorial': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'loophole': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'media': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
-            'operator': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
-            'operator_ref': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'violations'", 'null': 'True', 'to': "orm['bt.Operator']"}),
-            'resource': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
-            'resource_name': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'new'", 'max_length': '20', 'blank': 'True'}),
-            'temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['bt']
-    symmetrical = True

bt/migrations/0004_auto__del_field_violation_operator__chg_field_violation_operator_ref.py

-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'Violation.operator'
-        db.delete_column('bt_violation', 'operator')
-
-
-        # Changing field 'Violation.operator_ref'
-        db.alter_column('bt_violation', 'operator_ref_id', self.gf('django.db.models.fields.related.ForeignKey')(default=0, to=orm['bt.Operator']))
-
-    def backwards(self, orm):
-        # Adding field 'Violation.operator'
-        db.add_column('bt_violation', 'operator',
-                      self.gf('django.db.models.fields.CharField')(default=0, max_length=256),
-                      keep_default=False)
-
-
-        # Changing field 'Violation.operator_ref'
-        db.alter_column('bt_violation', 'operator_ref_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['bt.Operator']))
-
-    models = {
-        'bt.attachment': {
-            'Meta': {'object_name': 'Attachment'},
-            'comment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Comment']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'storage': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'bt.comment': {
-            'Meta': {'object_name': 'Comment'},
-            'comment': ('django.db.models.fields.TextField', [], {}),
-            'consent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'submitter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'submitter_name': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
-            'timestamp': ('django.db.models.fields.DateTimeField', [], {}),
-            'violation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Violation']"})
-        },
-        'bt.confirmation': {
-            'Meta': {'object_name': 'Confirmation'},
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'key': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'violation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['bt.Violation']"})
-        },
-        'bt.featuredcase': {
-            'Meta': {'object_name': 'FeaturedCase'},
-            'case': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['bt.Violation']", 'unique': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
-        },
-        'bt.operator': {
-            'Meta': {'object_name': 'Operator'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'logo': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'bt.violation': {
-            'Meta': {'object_name': 'Violation'},
-            'activationid': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
-            'contract': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
-            'contract_excerpt': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'contractual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'country': ('django.db.models.fields.CharField', [], {'max_length': '2'}),
-            'editorial': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'loophole': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'media': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
-            'operator_ref': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'violations'", 'to': "orm['bt.Operator']"}),
-            'resource': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
-            'resource_name': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'blank': 'True'}),
-            'state': ('django.db.models.fields.CharField', [], {'default': "'new'", 'max_length': '20', 'blank': 'True'}),
-            'temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['bt']
\ No newline at end of file

bt/models.py

 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-from django.contrib.comments.moderation import CommentModerator, moderator
+from django_comments.moderation import CommentModerator, moderator
 
 COUNTRIES = (
     ('BE', _('Belgium')),

bt/sheet.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from bt.models import Violation
 
 from django.db.models import Count
-import ooolib
+import odslib
 from django.utils.html import strip_tags
 import re, htmlentitydefs
 ##

bt/templatetags/bt.py

@@ -2,7 +2,7 @@ from django.template import Library, Variable
 from django.conf import settings
 from django import template
 import random
-from nnmon.bt.models import COUNTRIES, STATUS, TYPES, MEDIA
+from ..models import COUNTRIES, STATUS, TYPES, MEDIA
 
 register = Library()
 

docs/EMAILS.md

-Reading emails in development mode
-==================================
-
-In development mode, emails are written in `/tmp/app-messages/`.
-To find the last sent email use your funcky `ls` command:
-
-    ls -ltr
-

docs/SETUP.md

-SETUP
-=====
-
-This describes how to setup the nnmon dev environment
-
-Install the base dependencies
------------------------------
-
-Install the following packages:
-
-    sudo aptitude install python-sqlite python-ooolib python-imaging
-
-Install the base python virtualenv tools: