Permalink
Browse files

corrected rst nit and changed 'import base' to 'from . import base'

  • Loading branch information...
1 parent 0ce8e08 commit 596b2d6d93426c58a7615398ff82199fd0b683d1 @peterbe peterbe committed Oct 27, 2011
Showing with 7 additions and 6 deletions.
  1. +4 −3 README.rst
  2. +3 −3 tests/__init__.py
View
7 README.rst
@@ -19,9 +19,10 @@ and type the ``tox`` command. The ``tox.ini`` will handle the rest.
.. _`tox`: http://tox.readthedocs.org/
-Note: if you supply a different playdoh remote URL or a different
-branch or something, remember to delete the ``.playdoh/`` directory
-between tests for a clean slate.
+.. note::
+ if you supply a different playdoh remote URL or a different
+ branch or something, remember to delete the ``.playdoh/`` directory
+ between tests for a clean slate.
To try out cutting edge funfactory features in a real playdoh app, you can use
the develop command to install a link to the files within your virtualenv::
View
6 tests/__init__.py
@@ -16,9 +16,9 @@
DB_USER = os.environ.get('FF_DB_USER', 'root')
DB_PASS = os.environ.get('FF_DB_PASS', '')
DB_NAME = os.environ.get('FF_DB_NAME', '_funfactory_test')
-FF_PLAYDOH_REMOTE = os.environ.get('PLAYDOH_REMOTE',
+FF_PLAYDOH_REMOTE = os.environ.get('FF_PLAYDOH_REMOTE',
'git://github.com/mozilla/playdoh.git')
-FF_PLAYDOH_BRANCH = os.environ.get('PLAYDOH_BRANCH', 'base')
+FF_PLAYDOH_BRANCH = os.environ.get('FF_PLAYDOH_BRANCH', 'base')
def test_root():
@@ -72,7 +72,7 @@ def begin(self):
"'NAME': '%s'" % DB_NAME)
new_st = new_st.replace("SECRET_KEY = ''",
"SECRET_KEY = 'testinglolz'")
- new_st = new_st + "\nimport base\nINSTALLED_APPS = list(base.INSTALLED_APPS) + " \
+ new_st = new_st + "\nfrom . import base\nINSTALLED_APPS = list(base.INSTALLED_APPS) + " \
"['django.contrib.admin']\n"
with open(st, 'w') as f:

0 comments on commit 596b2d6

Please sign in to comment.