Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 596b2d6d93426c58a7615398ff82199fd0b683d1 1 parent 0ce8e08
Peter Bengtsson peterbe authored

Showing 2 changed files with 7 additions and 6 deletions. Show diff stats Hide diff stats

  1. +4 3 README.rst
  2. +3 3 tests/__init__.py
7 README.rst
Source Rendered
@@ -19,9 +19,10 @@ and type the ``tox`` command. The ``tox.ini`` will handle the rest.
19 19
20 20 .. _`tox`: http://tox.readthedocs.org/
21 21
22   -Note: if you supply a different playdoh remote URL or a different
23   -branch or something, remember to delete the ``.playdoh/`` directory
24   -between tests for a clean slate.
  22 +.. note::
  23 + if you supply a different playdoh remote URL or a different
  24 + branch or something, remember to delete the ``.playdoh/`` directory
  25 + between tests for a clean slate.
25 26
26 27 To try out cutting edge funfactory features in a real playdoh app, you can use
27 28 the develop command to install a link to the files within your virtualenv::
6 tests/__init__.py
@@ -16,9 +16,9 @@
16 16 DB_USER = os.environ.get('FF_DB_USER', 'root')
17 17 DB_PASS = os.environ.get('FF_DB_PASS', '')
18 18 DB_NAME = os.environ.get('FF_DB_NAME', '_funfactory_test')
19   -FF_PLAYDOH_REMOTE = os.environ.get('PLAYDOH_REMOTE',
  19 +FF_PLAYDOH_REMOTE = os.environ.get('FF_PLAYDOH_REMOTE',
20 20 'git://github.com/mozilla/playdoh.git')
21   -FF_PLAYDOH_BRANCH = os.environ.get('PLAYDOH_BRANCH', 'base')
  21 +FF_PLAYDOH_BRANCH = os.environ.get('FF_PLAYDOH_BRANCH', 'base')
22 22
23 23
24 24 def test_root():
@@ -72,7 +72,7 @@ def begin(self):
72 72 "'NAME': '%s'" % DB_NAME)
73 73 new_st = new_st.replace("SECRET_KEY = ''",
74 74 "SECRET_KEY = 'testinglolz'")
75   - new_st = new_st + "\nimport base\nINSTALLED_APPS = list(base.INSTALLED_APPS) + " \
  75 + new_st = new_st + "\nfrom . import base\nINSTALLED_APPS = list(base.INSTALLED_APPS) + " \
76 76 "['django.contrib.admin']\n"
77 77
78 78 with open(st, 'w') as f:

0 comments on commit 596b2d6

Please sign in to comment.
Something went wrong with that request. Please try again.