Skip to content

Commit

Permalink
Helper app functions need to return lists
Browse files Browse the repository at this point in the history
In order for the examples from installation instructions to work.
  • Loading branch information
codeinthehole authored and Sebastian Vetter committed Aug 21, 2013
1 parent 990af15 commit 83a6a27
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ To use ``django-fancypages`` in your own project follow these steps:

from fancyages import get_required_apps, get_fancypages_apps

YOUR_OTHER_APPS = (
YOUR_OTHER_APPS = [
...
)
]
INSTALLED_APPS = YOUR_OTHER_APPS + get_required_apps() + get_fancypages_apps()

3. Add the editor middleware that provides the editing panel to every
Expand Down
4 changes: 2 additions & 2 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def pytest_configure():
TEMPLATE_DIRS=(
sandbox('templates'),
),
INSTALLED_APPS=(
INSTALLED_APPS=[
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
Expand All @@ -67,7 +67,7 @@ def pytest_configure():
'twitter_tag',
'sorl.thumbnail',
'rest_framework',
) + fp.get_fancypages_apps(),
] + fp.get_fancypages_apps(),
AUTHENTICATION_BACKENDS=(
'django.contrib.auth.backends.ModelBackend',
),
Expand Down
8 changes: 4 additions & 4 deletions fancypages/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def get_fancypages_paths(path):


def get_required_apps():
return (
return [
'django_extensions',
# used for image thumbnailing
'sorl.thumbnail',
Expand All @@ -25,11 +25,11 @@ def get_required_apps():
'south',
# package used for twitter block
'twitter_tag',
)
]


def get_fancypages_apps():
return (
return [
'fancypages.assets',
'fancypages',
)
]
4 changes: 2 additions & 2 deletions sandbox/sandbox/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
location('templates'),
]

DJANGO_APPS = (
DJANGO_APPS = [
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
Expand All @@ -119,7 +119,7 @@

#'debug_toolbar',
'django_extensions',
)
]

from fancypages.defaults import *
INSTALLED_APPS = DJANGO_APPS + fp.get_required_apps() + fp.get_fancypages_apps()
Expand Down

0 comments on commit 83a6a27

Please sign in to comment.