Permalink
Browse files

[bug 872516] Create kitsune python module.

  • Loading branch information...
1 parent 68f2d09 commit 3f30d8752eb37094522368feb9e9c42448439bae @rlr rlr committed May 24, 2013
View
@@ -1,10 +1,10 @@
*.pyc
*.pyo
-settings_local.py
+kitsune/settings_local.py
pip-log.txt
.coverage
coverage.xml
-build.py
+kitsune/build.py
**-all.css
**-min.css
**-all.js
@@ -14,7 +14,6 @@ node_modules
tmp
locale
docs/_build
-highstock.src.js
/static
*.less.css
.DS_Store
View
@@ -124,9 +124,6 @@
[submodule "vendor/src/django-eadred"]
path = vendor/src/django-eadred
url = git://github.com/willkg/django-eadred.git
-[submodule "media/js/libs/ace"]
- path = media/js/libs/ace
- url = git://github.com/ajaxorg/ace-builds.git
[submodule "vendor/src/raven-python"]
path = vendor/src/raven-python
url = git://github.com/getsentry/raven-python.git
@@ -142,3 +139,6 @@
[submodule "vendor/src/premailer"]
path = vendor/src/premailer
url = git://github.com/peterbe/premailer.git
+[submodule "media/js/libs/ace"]
+ path = media/js/libs/ace
+ url = git://github.com/ajaxorg/ace-builds.git
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-
-import urls
-
from nose.tools import eq_
+from kitsune import urls
from sumo.tests import TestCase
from wiki.admin import DocumentAdmin
from wiki.models import Document
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -241,14 +241,14 @@
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = path('media')
+MEDIA_ROOT = path('../media')
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
# Examples: "http://media.lawrence.com", "http://example.com/media/"
MEDIA_URL = '/media/'
-STATIC_ROOT = path('static')
+STATIC_ROOT = path('../static')
STATIC_URL = '/static/'
# Paths that don't require a locale prefix.
File renamed without changes.
File renamed without changes.
View
@@ -26,10 +26,10 @@
from django.core.management import execute_manager, setup_environ
try:
- import settings_local as settings
+ from kitsune import settings_local as settings
except ImportError:
try:
- import settings # Assumed to be in the same directory.
+ from kitsune import settings # Assumed to be in the same directory.
except ImportError:
sys.stderr.write(
"Error: Tried importing 'settings_local.py' and 'settings.py' "
@@ -42,7 +42,7 @@
setup_environ(settings)
# Import for side-effect: configures our logging handlers.
-import log_settings
+from kitsune import log_settings
if __name__ == "__main__":
View
@@ -45,7 +45,7 @@ git submodule update --init --recursive
python manage.py update_product_details
-cat > settings_local.py <<SETTINGS
+cat > kitsune/settings_local.py <<SETTINGS
from settings import *
ROOT_URLCONF = '%s.urls' % ROOT_PACKAGE
LOG_LEVEL = logging.ERROR
View
@@ -37,7 +37,7 @@ git submodule update --init --recursive
python manage.py update_product_details
-cat > settings_local.py <<SETTINGS
+cat > kitsune/settings_local.py <<SETTINGS
from settings import *
ROOT_URLCONF = '%s.urls' % ROOT_PACKAGE
LOG_LEVEL = logging.ERROR
View
@@ -15,7 +15,7 @@
import commander_settings as settings
-os.environ['DJANGO_SETTINGS_MODULE'] = 'settings_local'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'kitsune.settings_local'
@task

0 comments on commit 3f30d87

Please sign in to comment.