Merge branch 'master' of github.com:comoga/django-constance

This commit is contained in:
Jiri Barton 2011-07-14 15:53:31 +02:00
commit 398021d8f7
3 changed files with 12 additions and 11 deletions

View file

@ -16,9 +16,9 @@ Install from PyPI::
Or install the `in-development version`_ using ``pip``::
pip install -e git+git://github.com/aleszoulek/django-constance#egg=django-constance
pip install -e git+git://github.com/comoga/django-constance#egg=django-constance
.. _`in-development version`: https://github.com/aleszoulek/django-constance/tarball/master#egg=django-constance-dev
.. _`in-development version`: https://github.com/comoga/django-constance/tarball/master#egg=django-constance-dev
Configuration
-------------
@ -173,11 +173,11 @@ with ``MY_SETTINGS_KEY`` in the ``Config`` pseudo model.
Screenshots
-----------
.. figure:: https://github.com/aleszoulek/django-constance/raw/master/docs/screenshot2.png
.. figure:: https://github.com/comoga/django-constance/raw/master/docs/screenshot2.png
The standard edit screen.
.. figure:: https://github.com/aleszoulek/django-constance/raw/master/docs/screenshot1.png
.. figure:: https://github.com/comoga/django-constance/raw/master/docs/screenshot1.png
The virtual application ``Constance`` among your regular applications.

View file

@ -5,18 +5,18 @@
import os
import sys
currentdir = os.path.dirname(os.path.abspath(__file__))
parentdir = os.path.dirname(currentdir)
sys.path.insert(0, parentdir)
sys.path.insert(0, currentdir)
testapp_dir = os.path.dirname(os.path.abspath(__file__))
constance_dir = os.path.dirname(testapp_dir)
sys.path.insert(0, constance_dir)
sys.path.insert(0, testapp_dir)
os.environ['DJANGO_SETTINGS_MODULE'] = 'testproject.settings'
from django.test.simple import run_tests
from django.test.simple import DjangoTestSuiteRunner
def main():
failures = run_tests(['test_app'], verbosity=1, interactive=True)
runner = DjangoTestSuiteRunner()
failures = runner.run_tests(['test_app'], verbosity=1, interactive=True)
sys.exit(failures)
if __name__ == '__main__':

View file

@ -23,6 +23,7 @@ class FakeRequest(WSGIRequest):
'wsgi.multiprocess': True,
'wsgi.multithread': False,
'wsgi.run_once': False,
'wsgi.input': None,
}
super(FakeRequest, self).__init__(environ)
if user: