summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xforum/models/__init__.py2
-rwxr-xr-xforum/models/user.py5
-rwxr-xr-xforum/modules.py2
-rw-r--r--settings.py3
4 files changed, 3 insertions, 9 deletions
diff --git a/forum/models/__init__.py b/forum/models/__init__.py
index 77825079..01160e56 100755
--- a/forum/models/__init__.py
+++ b/forum/models/__init__.py
@@ -340,4 +340,4 @@ from forum.modules import get_modules_script_classes
for k, v in get_modules_script_classes('models', models.Model).items():
if not k in __all__:
__all__.append(k)
- exec "%s = v" % k \ No newline at end of file
+ exec "%s = v" % k
diff --git a/forum/models/user.py b/forum/models/user.py
index 3a600e00..b7a3be15 100755
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -64,14 +64,11 @@ class AnonymousEmail(models.Model):
class Meta:
app_label = 'forum'
-
class AuthKeyUserAssociation(models.Model):
- key = models.CharField(max_length=256,null=False,unique=True)
+ key = models.CharField(max_length=255,null=False,unique=True)
provider = models.CharField(max_length=64)
user = models.ForeignKey(User)
added_at = models.DateTimeField(default=datetime.datetime.now)
class Meta:
app_label = 'forum'
-
- \ No newline at end of file
diff --git a/forum/modules.py b/forum/modules.py
index b7d7c5ca..f786c719 100755
--- a/forum/modules.py
+++ b/forum/modules.py
@@ -76,4 +76,4 @@ def module_templates_loader(name, dirs=None):
raise TemplateDoesNotExist, name
-module_templates_loader.is_usable = True \ No newline at end of file
+module_templates_loader.is_usable = True
diff --git a/settings.py b/settings.py
index 43f40d2a..4abe1e7d 100644
--- a/settings.py
+++ b/settings.py
@@ -77,9 +77,6 @@ AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend',]
if USE_SPHINX_SEARCH:
INSTALLED_APPS.append('djangosphinx')
-if USE_FB_CONNECT:
- INSTALLED_APPS.append('fbconnect')
-
if DATABASE_ENGINE in ('postgresql_psycopg2', 'postgresql', ) and False:
USE_PG_FTS = True
INSTALLED_APPS.append('pgfulltext')