moved livesettings and django_authopenid into forum/deps

67 files changed, 57 insertions, 57 deletions

diff --git a/forum/conf/email.py b/forum/conf/email.py
index 0144f35e..2245cdce 100644
--- a/forum/conf/email.py
+++ b/forum/conf/email.py
@@ -2,8 +2,8 @@
 Email related settings
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue, BooleanValue
-from livesettings import StringValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue, BooleanValue
+from forum.deps.livesettings import StringValue
 from django.utils.translation import ugettext as _
 from forum import const
 
diff --git a/forum/conf/external_keys.py b/forum/conf/external_keys.py
index f43e1120..60111fdb 100644
--- a/forum/conf/external_keys.py
+++ b/forum/conf/external_keys.py
@@ -2,7 +2,7 @@
 External service key settings
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, StringValue
+from forum.deps.livesettings import ConfigurationGroup, StringValue
 from django.utils.translation import ugettext as _
 from django.conf import settings as django_settings
 
diff --git a/forum/conf/flatpages.py b/forum/conf/flatpages.py
index eb6b646a..14398431 100644
--- a/forum/conf/flatpages.py
+++ b/forum/conf/flatpages.py
@@ -2,7 +2,7 @@
 Q&A forum flatpages (about, etc.)
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, LongStringValue
+from forum.deps.livesettings import ConfigurationGroup, LongStringValue
 from django.utils.translation import ugettext as _
 
 FLATPAGES = ConfigurationGroup(
diff --git a/forum/conf/forum_data_rules.py b/forum/conf/forum_data_rules.py
index e452ea7b..f9c4afda 100644
--- a/forum/conf/forum_data_rules.py
+++ b/forum/conf/forum_data_rules.py
@@ -2,8 +2,8 @@
 Settings for forum data display and entry
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, BooleanValue, IntegerValue
-from livesettings import StringValue
+from forum.deps.livesettings import ConfigurationGroup, BooleanValue, IntegerValue
+from forum.deps.livesettings import StringValue
 from django.utils.translation import ugettext as _
 from forum import const
 
@@ -39,7 +39,7 @@ settings.register(
     )
 )
 
-#todo: looks like there is a bug in livesettings 
+#todo: looks like there is a bug in forum.deps.livesettings 
 #that does not allow Integer values with defaults and choices
 settings.register(
     StringValue(
diff --git a/forum/conf/minimum_reputation.py b/forum/conf/minimum_reputation.py
index a83d94fd..ecb7f4ad 100644
--- a/forum/conf/minimum_reputation.py
+++ b/forum/conf/minimum_reputation.py
@@ -3,7 +3,7 @@ Settings for minimum reputation required for
 a variety of actions on the askbot forum
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue
 from django.utils.translation import ugettext as _
 
 MIN_REP = ConfigurationGroup(
diff --git a/forum/conf/reputation_changes.py b/forum/conf/reputation_changes.py
index cef177f5..2f0bca65 100644
--- a/forum/conf/reputation_changes.py
+++ b/forum/conf/reputation_changes.py
@@ -4,7 +4,7 @@ user in response to various actions by the same
 users or others
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue
 from django.utils.translation import ugettext as _
 
 REP_CHANGES = ConfigurationGroup(
diff --git a/forum/conf/settings_wrapper.py b/forum/conf/settings_wrapper.py
index b3645333..305c0fd3 100644
--- a/forum/conf/settings_wrapper.py
+++ b/forum/conf/settings_wrapper.py
@@ -1,5 +1,5 @@
 """
-Definition of a Singleton wrapper class for livesettings
+Definition of a Singleton wrapper class for forum.deps.livesettings
 with interface similar to django.conf.settings
 that is each setting has unique key and is accessible
 via dotted lookup.
@@ -11,16 +11,16 @@ from forum.conf import settings as forum_settings
 forum_settings.BLAH
 
 NOTE that at the moment there is distinction between settings
-(django settings) and forum_settings (livesettings)
+(django settings) and forum_settings (forum.deps.livesettings)
 
-the value will be taken from livesettings database or cache
+the value will be taken from forum.deps.livesettings database or cache
 note that during compilation phase database is not accessible
 for the most part, so actual values are reliably available only 
 at run time
 
-livesettings is a module developed for satchmo project
+forum.deps.livesettings is a module developed for satchmo project
 """
-from livesettings import SortedDotDict, config_register
+from forum.deps.livesettings import SortedDotDict, config_register
 
 class ConfigSettings(object):
     """A very simple Singleton wrapper for settings
@@ -41,13 +41,13 @@ class ConfigSettings(object):
         """value lookup returns the actual value of setting
         not the object - this way only very minimal modifications
         will be required in code to convert an app
-        depending on django.conf.settings to livesettings
+        depending on django.conf.settings to forum.deps.livesettings
         """
         return getattr(self.__instance, key).value
 
     def register(self, value):
         """registers the setting
-        value must be a subclass of livesettings.Value
+        value must be a subclass of forum.deps.livesettings.Value
         """
         key = value.key
         group_key = value.group.key
diff --git a/forum/conf/site_settings.py b/forum/conf/site_settings.py
index 05d0c1c8..a4f864b8 100644
--- a/forum/conf/site_settings.py
+++ b/forum/conf/site_settings.py
@@ -3,7 +3,7 @@ Q&A website settings - title, desctiption, basic urls
 keywords
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, StringValue
+from forum.deps.livesettings import ConfigurationGroup, StringValue
 from django.utils.translation import ugettext as _
 from django.utils.html import escape
 from forum import const
diff --git a/forum/conf/skin_counter_settings.py b/forum/conf/skin_counter_settings.py
index 5a9d177f..e5998433 100644
--- a/forum/conf/skin_counter_settings.py
+++ b/forum/conf/skin_counter_settings.py
@@ -2,7 +2,7 @@
 Skin settings to color view, vote and answer counters
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue, StringValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue, StringValue
 from django.utils.translation import ugettext as _
 from forum.deps.grapefruit import Color
 
diff --git a/forum/conf/skin_general_settings.py b/forum/conf/skin_general_settings.py
index 748510e7..3c74a593 100644
--- a/forum/conf/skin_general_settings.py
+++ b/forum/conf/skin_general_settings.py
@@ -2,7 +2,7 @@
 General skin settings
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, StringValue, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, StringValue, IntegerValue
 from django.utils.translation import ugettext as _
 from forum.skins.utils import get_skin_choices
 
diff --git a/forum/conf/user_settings.py b/forum/conf/user_settings.py
index 760f921f..a1c09d65 100644
--- a/forum/conf/user_settings.py
+++ b/forum/conf/user_settings.py
@@ -2,7 +2,7 @@
 User policy settings
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, BooleanValue, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, BooleanValue, IntegerValue
 from django.utils.translation import ugettext as _
 
 USER_SETTINGS = ConfigurationGroup(
diff --git a/forum/conf/vote_rules.py b/forum/conf/vote_rules.py
index f249ef53..04332bb7 100644
--- a/forum/conf/vote_rules.py
+++ b/forum/conf/vote_rules.py
@@ -5,7 +5,7 @@ and offensive flags.
 For example number of times a person can vote each day, etc.
 """
 from forum.conf.settings_wrapper import settings
-from livesettings import ConfigurationGroup, IntegerValue
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue
 from django.utils.translation import ugettext as _
 
 VOTE_RULES = ConfigurationGroup(
diff --git a/django_authopenid/README b/forum/deps/django_authopenid/README
index 67c33d60..67c33d60 100644
--- a/django_authopenid/README
+++ b/forum/deps/django_authopenid/README
diff --git a/django_authopenid/__init__.py b/forum/deps/django_authopenid/__init__.py
index ff040ed7..ff040ed7 100644
--- a/django_authopenid/__init__.py
+++ b/forum/deps/django_authopenid/__init__.py
diff --git a/django_authopenid/admin.py b/forum/deps/django_authopenid/admin.py
index f64ee579..fa6fcbb9 100644
--- a/django_authopenid/admin.py
+++ b/forum/deps/django_authopenid/admin.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from django.contrib import admin
-from django_authopenid.models import UserAssociation
+from forum.deps.django_authopenid.models import UserAssociation
 
 
 class UserAssociationAdmin(admin.ModelAdmin):
diff --git a/django_authopenid/forms.py b/forum/deps/django_authopenid/forms.py
index 2fd3fd7f..dd66591e 100644
--- a/django_authopenid/forms.py
+++ b/forum/deps/django_authopenid/forms.py
@@ -50,7 +50,7 @@ except ImportError:
     from yadis import xri
     
 from forum.utils.forms import clean_next
-from django_authopenid.models import ExternalLoginData
+from forum.deps.django_authopenid.models import ExternalLoginData
 
 __all__ = ['OpenidSigninForm', 'ClassicLoginForm', 'OpenidVerifyForm',
         'OpenidRegisterForm', 'ClassicRegisterForm', 'ChangePasswordForm',
diff --git a/django_authopenid/middleware.py b/forum/deps/django_authopenid/middleware.py
index 2be8da90..d3da56da 100644
--- a/django_authopenid/middleware.py
+++ b/forum/deps/django_authopenid/middleware.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django_authopenid import mimeparse
+from forum.deps.django_authopenid import mimeparse
 from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.conf import settings
diff --git a/django_authopenid/mimeparse.py b/forum/deps/django_authopenid/mimeparse.py
index ab02eab0..ab02eab0 100644
--- a/django_authopenid/mimeparse.py
+++ b/forum/deps/django_authopenid/mimeparse.py
diff --git a/django_authopenid/models.py b/forum/deps/django_authopenid/models.py
index a12c2fec..a12c2fec 100644
--- a/django_authopenid/models.py
+++ b/forum/deps/django_authopenid/models.py
diff --git a/django_authopenid/urls.py b/forum/deps/django_authopenid/urls.py
index 65afc45a..97032b28 100644
--- a/django_authopenid/urls.py
+++ b/forum/deps/django_authopenid/urls.py
@@ -16,7 +16,7 @@ from django.conf import settings
 #settings.EXTERNAL_LOGIN_APP.views.signup_view()
 
 #print settings.EXTERNAL_LOGIN_APP.__dict__.keys()
-urlpatterns = patterns('django_authopenid.views',
+urlpatterns = patterns('forum.deps.django_authopenid.views',
     # yadis rdf
     url(r'^yadis.xrdf$', 'xrdf', name='yadis_xrdf'),
      # manage account registration
@@ -49,7 +49,7 @@ if settings.USE_EXTERNAL_LEGACY_LOGIN:
     EXTERNAL_LOGIN_APP = settings.LOAD_EXTERNAL_LOGIN_APP()
     urlpatterns += patterns('',
         url('^%s$' % _('external-login/forgot-password/'),\
-            'django_authopenid.views.external_legacy_login_info', \
+            'forum.deps.django_authopenid.views.external_legacy_login_info', \
             name='user_external_legacy_login_issues'),
         url('^%s$' % _('external-login/signup/'), \
             EXTERNAL_LOGIN_APP.views.signup,\
diff --git a/django_authopenid/util.py b/forum/deps/django_authopenid/util.py
index cd2c2e2c..cd2c2e2c 100644
--- a/django_authopenid/util.py
+++ b/forum/deps/django_authopenid/util.py
diff --git a/django_authopenid/views.py b/forum/deps/django_authopenid/views.py
index cce4beb5..52809f01 100644
--- a/django_authopenid/views.py
+++ b/forum/deps/django_authopenid/views.py
@@ -62,9 +62,9 @@ import re
 import urllib
 
 from forum.forms import SimpleEmailSubscribeForm 
-from django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response
-from django_authopenid.models import UserAssociation, UserPasswordQueue, ExternalLoginData
-from django_authopenid.forms import OpenidSigninForm, ClassicLoginForm, OpenidRegisterForm, \
+from forum.deps.django_authopenid.util import OpenID, DjangoOpenIDStore, from_openid_response
+from forum.deps.django_authopenid.models import UserAssociation, UserPasswordQueue, ExternalLoginData
+from forum.deps.django_authopenid.forms import OpenidSigninForm, ClassicLoginForm, OpenidRegisterForm, \
         OpenidVerifyForm, ClassicRegisterForm, ChangePasswordForm, ChangeEmailForm, \
         ChangeopenidForm, DeleteForm, EmailPasswordForm
 import logging
@@ -155,7 +155,7 @@ def complete(request, on_success=None, on_failure=None, return_to=None):
     on_success = on_success or default_on_success
     on_failure = on_failure or default_on_failure
     
-    logging.debug('in django_authopenid.complete')
+    logging.debug('in forum.deps.django_authopenid.complete')
     
     consumer = Consumer(request.session, DjangoOpenIDStore())
     # make sure params are encoded in utf8
diff --git a/livesettings/README b/forum/deps/livesettings/README
index 6fe70cc5..6fe70cc5 100644
--- a/livesettings/README
+++ b/forum/deps/livesettings/README
diff --git a/livesettings/__init__.py b/forum/deps/livesettings/__init__.py
index 49aaacc9..49aaacc9 100644
--- a/livesettings/__init__.py
+++ b/forum/deps/livesettings/__init__.py
diff --git a/livesettings/forms.py b/forum/deps/livesettings/forms.py
index b1c5f6f4..f8d40895 100644
--- a/livesettings/forms.py
+++ b/forum/deps/livesettings/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from livesettings import *
+from forum.deps.livesettings import *
 import logging
 
 log = logging.getLogger('configuration')
diff --git a/livesettings/functions.py b/forum/deps/livesettings/functions.py
index 8b919083..4c2073ea 100644
--- a/livesettings/functions.py
+++ b/forum/deps/livesettings/functions.py
@@ -1,7 +1,7 @@
 from django.utils.translation import ugettext
-from livesettings import values
-from livesettings.models import SettingNotSet
-from livesettings.utils import is_string_like
+from forum.deps.livesettings import values
+from forum.deps.livesettings.models import SettingNotSet
+from forum.deps.livesettings.utils import is_string_like
 
 import logging
 
diff --git a/livesettings/locale/de/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/de/LC_MESSAGES/django.mo
index e176bc53..e176bc53 100644
--- a/livesettings/locale/de/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/de/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/de/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/de/LC_MESSAGES/django.po
index 1cef701b..1cef701b 100644
--- a/livesettings/locale/de/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/de/LC_MESSAGES/django.po
diff --git a/livesettings/locale/en/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/en/LC_MESSAGES/django.mo
index c2bc0b94..c2bc0b94 100644
--- a/livesettings/locale/en/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/en/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/en/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/en/LC_MESSAGES/django.po
index 45eb23a5..45eb23a5 100644
--- a/livesettings/locale/en/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/en/LC_MESSAGES/django.po
diff --git a/livesettings/locale/es/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/es/LC_MESSAGES/django.po
index e69de29b..e69de29b 100644
--- a/livesettings/locale/es/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/es/LC_MESSAGES/django.po
diff --git a/livesettings/locale/fr/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/fr/LC_MESSAGES/django.mo
index dd872edd..dd872edd 100644
--- a/livesettings/locale/fr/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/fr/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/fr/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/fr/LC_MESSAGES/django.po
index 90475585..90475585 100644
--- a/livesettings/locale/fr/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/fr/LC_MESSAGES/django.po
diff --git a/livesettings/locale/he/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/he/LC_MESSAGES/django.mo
index 04270a04..04270a04 100644
--- a/livesettings/locale/he/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/he/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/he/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/he/LC_MESSAGES/django.po
index 362f5612..362f5612 100644
--- a/livesettings/locale/he/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/he/LC_MESSAGES/django.po
diff --git a/livesettings/locale/it/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/it/LC_MESSAGES/django.mo
index 05c50952..05c50952 100644
--- a/livesettings/locale/it/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/it/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/it/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/it/LC_MESSAGES/django.po
index 66401866..66401866 100644
--- a/livesettings/locale/it/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/it/LC_MESSAGES/django.po
diff --git a/livesettings/locale/ko/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/ko/LC_MESSAGES/django.mo
index e0738605..e0738605 100644
--- a/livesettings/locale/ko/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/ko/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/ko/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/ko/LC_MESSAGES/django.po
index 0dbd2d4d..0dbd2d4d 100644
--- a/livesettings/locale/ko/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/ko/LC_MESSAGES/django.po
diff --git a/livesettings/locale/pl/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/pl/LC_MESSAGES/django.mo
index f45e49ed..f45e49ed 100644
--- a/livesettings/locale/pl/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/pl/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/pl/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/pl/LC_MESSAGES/django.po
index 1e7b4199..1e7b4199 100644
--- a/livesettings/locale/pl/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/pl/LC_MESSAGES/django.po
diff --git a/livesettings/locale/pt_BR/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/pt_BR/LC_MESSAGES/django.mo
index a8bfb8b2..a8bfb8b2 100644
--- a/livesettings/locale/pt_BR/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/pt_BR/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/pt_BR/LC_MESSAGES/django.po
index 72d49df7..72d49df7 100644
--- a/livesettings/locale/pt_BR/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/pt_BR/LC_MESSAGES/django.po
diff --git a/livesettings/locale/ru/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/ru/LC_MESSAGES/django.mo
index 42e6074a..42e6074a 100644
--- a/livesettings/locale/ru/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/ru/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/ru/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/ru/LC_MESSAGES/django.po
index a0db054b..a0db054b 100644
--- a/livesettings/locale/ru/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/ru/LC_MESSAGES/django.po
diff --git a/livesettings/locale/sv/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/sv/LC_MESSAGES/django.mo
index caed0ab9..caed0ab9 100644
--- a/livesettings/locale/sv/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/sv/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/sv/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/sv/LC_MESSAGES/django.po
index 6b096f6b..6b096f6b 100644
--- a/livesettings/locale/sv/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/sv/LC_MESSAGES/django.po
diff --git a/livesettings/locale/tr/LC_MESSAGES/django.mo b/forum/deps/livesettings/locale/tr/LC_MESSAGES/django.mo
index d56ad423..d56ad423 100644
--- a/livesettings/locale/tr/LC_MESSAGES/django.mo
+++ b/forum/deps/livesettings/locale/tr/LC_MESSAGES/django.mo
diff --git a/livesettings/locale/tr/LC_MESSAGES/django.po b/forum/deps/livesettings/locale/tr/LC_MESSAGES/django.po
index bb2a1506..bb2a1506 100644
--- a/livesettings/locale/tr/LC_MESSAGES/django.po
+++ b/forum/deps/livesettings/locale/tr/LC_MESSAGES/django.po
diff --git a/livesettings/models.py b/forum/deps/livesettings/models.py
index 43f14648..5d27033c 100644
--- a/livesettings/models.py
+++ b/forum/deps/livesettings/models.py
@@ -5,7 +5,7 @@ from django.db.models import loading
 from django.utils.translation import ugettext_lazy as _
 from keyedcache import cache_key, cache_get, cache_set, NotCachedError
 from keyedcache.models import CachedObjectMixin
-from livesettings.overrides import get_overrides
+from forum.deps.livesettings.overrides import get_overrides
 import logging
 
 log = logging.getLogger('configuration.models')
diff --git a/livesettings/overrides.py b/forum/deps/livesettings/overrides.py
index 5f88d5c5..58c1079b 100644
--- a/livesettings/overrides.py
+++ b/forum/deps/livesettings/overrides.py
@@ -1,4 +1,4 @@
-"""Allows livesettings to be "locked down" and no longer use the settings page or the database
+"""Allows forum.deps.livesettings to be "locked down" and no longer use the settings page or the database
 for settings retrieval.
 """
 
@@ -20,7 +20,7 @@ def _safe_get_siteid(site):
     return siteid
 
 def get_overrides(siteid=-1):
-    """Check to see if livesettings is allowed to use the database.  If not, then
+    """Check to see if forum.deps.livesettings is allowed to use the database.  If not, then
     it will only use the values in the dictionary, LIVESETTINGS_OPTIONS[SITEID]['SETTINGS'],
     this allows 'lockdown' of a live site.
 
diff --git a/livesettings/signals.py b/forum/deps/livesettings/signals.py
index ddea31f5..ddea31f5 100644
--- a/livesettings/signals.py
+++ b/forum/deps/livesettings/signals.py
diff --git a/livesettings/templates/livesettings/_admin_site_views.html b/forum/deps/livesettings/templates/livesettings/_admin_site_views.html
index 17d08f58..17d08f58 100644
--- a/livesettings/templates/livesettings/_admin_site_views.html
+++ b/forum/deps/livesettings/templates/livesettings/_admin_site_views.html
diff --git a/livesettings/templates/livesettings/group_settings.html b/forum/deps/livesettings/templates/livesettings/group_settings.html
index e56f764f..e56f764f 100644
--- a/livesettings/templates/livesettings/group_settings.html
+++ b/forum/deps/livesettings/templates/livesettings/group_settings.html
diff --git a/livesettings/templates/livesettings/site_settings.html b/forum/deps/livesettings/templates/livesettings/site_settings.html
index 35333778..35333778 100644
--- a/livesettings/templates/livesettings/site_settings.html
+++ b/forum/deps/livesettings/templates/livesettings/site_settings.html
diff --git a/livesettings/templates/livesettings/text.txt b/forum/deps/livesettings/templates/livesettings/text.txt
index d57a57e3..d57a57e3 100644
--- a/livesettings/templates/livesettings/text.txt
+++ b/forum/deps/livesettings/templates/livesettings/text.txt
diff --git a/livesettings/templatetags/__init__.py b/forum/deps/livesettings/templatetags/__init__.py
index e69de29b..e69de29b 100644
--- a/livesettings/templatetags/__init__.py
+++ b/forum/deps/livesettings/templatetags/__init__.py
diff --git a/livesettings/templatetags/config_tags.py b/forum/deps/livesettings/templatetags/config_tags.py
index bcdded12..140014ba 100644
--- a/livesettings/templatetags/config_tags.py
+++ b/forum/deps/livesettings/templatetags/config_tags.py
@@ -1,8 +1,8 @@
 from django import template
 from django.contrib.sites.models import Site
 from django.core import urlresolvers
-from livesettings import config_value
-from livesettings.utils import url_join
+from forum.deps.livesettings import config_value
+from forum.deps.livesettings.utils import url_join
 import logging
 
 log = logging.getLogger('configuration.config_tags')
@@ -88,4 +88,4 @@ def admin_site_views(view):
     return ret
 
 
-register.inclusion_tag('livesettings/_admin_site_views.html')(admin_site_views)
+register.inclusion_tag('forum.deps.livesettings/_admin_site_views.html')(admin_site_views)
diff --git a/livesettings/tests.py b/forum/deps/livesettings/tests.py
index 2a60bf7e..f604af99 100644
--- a/livesettings/tests.py
+++ b/forum/deps/livesettings/tests.py
@@ -1,7 +1,7 @@
 from django.conf import settings as djangosettings
 from django.test import TestCase
 import keyedcache
-from livesettings import *
+from forum.deps.livesettings import *
 import logging
 log = logging.getLogger('test');
 
diff --git a/livesettings/urls.py b/forum/deps/livesettings/urls.py
index 16bb8332..4d2bf0f2 100644
--- a/livesettings/urls.py
+++ b/forum/deps/livesettings/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('livesettings.views',
+urlpatterns = patterns('forum.deps.livesettings.views',
     url(r'^$', 'site_settings', {}, name='site_settings'),
     url(r'^export/$', 'export_as_python', {}, name='settings_export'),
     url(r'^(?P<group>[^/]+)/$', 'group_settings', name='group_settings'),
diff --git a/livesettings/utils.py b/forum/deps/livesettings/utils.py
index c0e0e293..c0e0e293 100644
--- a/livesettings/utils.py
+++ b/forum/deps/livesettings/utils.py
diff --git a/livesettings/values.py b/forum/deps/livesettings/values.py
index db952172..f00fdc97 100644
--- a/livesettings/values.py
+++ b/forum/deps/livesettings/values.py
@@ -9,9 +9,9 @@ from django.utils import simplejson
 from django.utils.datastructures import SortedDict
 from django.utils.encoding import smart_str
 from django.utils.translation import gettext, ugettext_lazy as _
-from livesettings.models import find_setting, LongSetting, Setting, SettingNotSet
-from livesettings.overrides import get_overrides
-from livesettings.utils import load_module, is_string_like, is_list_or_tuple
+from forum.deps.livesettings.models import find_setting, LongSetting, Setting, SettingNotSet
+from forum.deps.livesettings.overrides import get_overrides
+from forum.deps.livesettings.utils import load_module, is_string_like, is_list_or_tuple
 import datetime
 import logging
 import signals
@@ -344,7 +344,7 @@ class Value(object):
 
                 return True
         else:
-            log.debug('not updating setting %s.%s - livesettings db is disabled',self.group.key, self.key)
+            log.debug('not updating setting %s.%s - forum.deps.livesettings db is disabled',self.group.key, self.key)
 
         return False
 
diff --git a/livesettings/views.py b/forum/deps/livesettings/views.py
index c2a2ccdc..ae78ca3f 100644
--- a/livesettings/views.py
+++ b/forum/deps/livesettings/views.py
@@ -4,13 +4,13 @@ from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.contrib.admin.views.decorators import staff_member_required
 from django.views.decorators.cache import never_cache
-from livesettings import ConfigurationSettings, forms
-from livesettings.overrides import get_overrides
+from forum.deps.livesettings import ConfigurationSettings, forms
+from forum.deps.livesettings.overrides import get_overrides
 import logging
 
 log = logging.getLogger('configuration.views')
 
-def group_settings(request, group, template='livesettings/group_settings.html'):
+def group_settings(request, group, template='forum.deps.livesettings/group_settings.html'):
     # Determine what set of settings this editor is used for
     
     use_db, overrides = get_overrides();
@@ -62,12 +62,12 @@ def site_settings(request):
     mgr = ConfigurationSettings()
     default_group= mgr.groups()[0].key
     return HttpResponseRedirect(reverse('group_settings', args=[default_group]))
-    #return group_settings(request, group=None, template='livesettings/site_settings.html')
+    #return group_settings(request, group=None, template='forum.deps.livesettings/site_settings.html')
     
 def export_as_python(request):
     """Export site settings as a dictionary of dictionaries"""
     
-    from livesettings.models import Setting, LongSetting
+    from forum.deps.livesettings.models import Setting, LongSetting
     import pprint
     
     work = {}
@@ -88,6 +88,6 @@ def export_as_python(request):
     pp = pprint.PrettyPrinter(indent=4)
     pretty = pp.pformat(work)
 
-    return render_to_response('livesettings/text.txt', { 'text' : pretty }, mimetype='text/plain')
+    return render_to_response('forum.deps.livesettings/text.txt', { 'text' : pretty }, mimetype='text/plain')
     
 export_as_python = never_cache(staff_member_required(export_as_python))
diff --git a/forum/importers/stackexchange/management/commands/load_stackexchange.py b/forum/importers/stackexchange/management/commands/load_stackexchange.py
index 5145035e..2c73c5a6 100644
--- a/forum/importers/stackexchange/management/commands/load_stackexchange.py
+++ b/forum/importers/stackexchange/management/commands/load_stackexchange.py
@@ -8,7 +8,7 @@ import forum.importers.stackexchange.parse_models as se_parser
 from xml.etree import ElementTree as et
 from django.db import models
 import forum.models as askbot
-import django_authopenid.models as askbot_openid
+import forum.deps.django_authopenid.models as askbot_openid
 import forum.importers.stackexchange.models as se
 from forum.forms import EditUserEmailFeedsForm
 from forum.conf import settings as forum_settings
diff --git a/forum/settings.py b/forum/settings.py
index 6e31634f..95e9bf81 100644
--- a/forum/settings.py
+++ b/forum/settings.py
@@ -1,6 +1,6 @@
 #todo: this file is currently not in use
 import os
-from livesettings import ConfigurationGroup, IntegerValue, config_register
+from forum.deps.livesettings import ConfigurationGroup, IntegerValue, config_register
 
 INSTALLED_APPS = ['forum']
 
diff --git a/forum/urls.py b/forum/urls.py
index 1864c608..b7637f54 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -197,7 +197,7 @@ urlpatterns = patterns('',
     url( r'^%s$' % _('upload/'), app.writers.upload, name='upload'),
     url(r'^%s$' % _('search/'), app.readers.search, name='search'),
     url(r'^%s$' % _('feedback/'), app.meta.feedback, name='feedback'),
-    (r'^%s' % _('account/'), include('django_authopenid.urls')),
+    (r'^%s' % _('account/'), include('forum.deps.django_authopenid.urls')),
     (r'^i18n/', include('django.conf.urls.i18n')),
     url(r'^feeds/rss/$', RssLastestQuestionsFeed, name="latest_questions_feed"),
 )
diff --git a/settings.py b/settings.py
index 3546ddf7..f0d11242 100644
--- a/settings.py
+++ b/settings.py
@@ -75,10 +75,10 @@ INSTALLED_APPS = (
     'django.contrib.sitemaps',
     'debug_toolbar',
     'forum',
-    'django_authopenid',
+    'forum.deps.django_authopenid',
     #'forum.importers.stackexchange', #se loader
     'south',
-    'livesettings',
+    'forum.deps.livesettings',
     'keyedcache',
 )