diff options
| author | Tom Christie | 2014-08-19 16:15:48 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-08-19 16:15:48 +0100 |
| commit | 390061bed0991892dfa6c9b953fffc1bd15564a9 (patch) | |
| tree | 19b77e0e7b2c3559e7a427196364e7d1060b08b5 /tests/settings.py | |
| parent | e385a7b8eb6e538698f28128e43fe8bfaefd4e97 (diff) | |
| parent | 2d2737f367c241c29c9c3913f2dba986c7c9a4a5 (diff) | |
| download | django-rest-framework-390061bed0991892dfa6c9b953fffc1bd15564a9.tar.bz2 | |
Merge pull request #1780 from tomchristie/pytest-tweaks
Added `runtests.py` and `flake8` code linting.
Diffstat (limited to 'tests/settings.py')
| -rw-r--r-- | tests/settings.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/settings.py b/tests/settings.py index de41dc66..91c9ed09 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -68,7 +68,6 @@ SECRET_KEY = 'u@x-aj9(hoh#rb-^ymf#g2jx_hp0vj7u5#b@ag1n^seu9e!%cy' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', ) MIDDLEWARE_CLASSES = ( @@ -104,8 +103,8 @@ INSTALLED_APPS = ( # OAuth is optional and won't work if there is no oauth_provider & oauth2 try: - import oauth_provider - import oauth2 + import oauth_provider # NOQA + import oauth2 # NOQA except ImportError: pass else: @@ -114,7 +113,7 @@ else: ) try: - import provider + import provider # NOQA except ImportError: pass else: @@ -125,13 +124,13 @@ else: # guardian is optional try: - import guardian + import guardian # NOQA except ImportError: pass else: ANONYMOUS_USER_ID = -1 AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', # default + 'django.contrib.auth.backends.ModelBackend', # default 'guardian.backends.ObjectPermissionBackend', ) INSTALLED_APPS += ( |