Skip to content

Commit

Permalink
fix 402 pep8 rule
Browse files Browse the repository at this point in the history
  • Loading branch information
brunosmartin committed Feb 8, 2015
1 parent a147601 commit 0f604fc
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
4 changes: 1 addition & 3 deletions conftest.py
@@ -1,15 +1,13 @@
import pytest
from django.conf import settings
from pytest_django.lazy_django import django_settings_is_configured


def pytest_addoption(parser):
parser.addoption("--collectstatic", action="store_true",
help="run slow collectstatic test")


from pytest_django.lazy_django import django_settings_is_configured


@pytest.fixture(autouse=True, scope='session')
def _django_test_environment(request):
"""
Expand Down
5 changes: 3 additions & 2 deletions timtec/settings.py
@@ -1,8 +1,11 @@
# -*- coding: utf-8 -*-
# Django settings for timtec project.
from django.utils.translation import ugettext_lazy as _
from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS as TCP

import os


SETTINGS_DIR = os.path.dirname(os.path.realpath(__file__))
PROJECT_ROOT = os.path.dirname(SETTINGS_DIR)

Expand Down Expand Up @@ -356,8 +359,6 @@
# 'django.template.loaders.eggs.Loader',
)

from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS as TCP

TEMPLATE_CONTEXT_PROCESSORS = TCP + (
'django.core.context_processors.request',
'allauth.account.context_processors.account',
Expand Down
4 changes: 3 additions & 1 deletion timtec/settings_local_ci.py
@@ -1,10 +1,12 @@
# -*- coding: utf-8 -*-
# configurations for the continous integration server
# https://docs.djangoproject.com/en/dev/ref/settings/
import tempfile


DEBUG = True
TEMPLATE_DEBUG = DEBUG

import tempfile
STATIC_ROOT = tempfile.mkdtemp('static')

ALLOWED_HOSTS = [
Expand Down
8 changes: 4 additions & 4 deletions timtec/urls.py
Expand Up @@ -3,10 +3,6 @@
from django.conf.urls import patterns, include, url
from django.conf.urls.static import static

# Uncomment the next two lines to enable the admin:
from django.contrib import admin as django_admin
django_admin.autodiscover()

from django.views.generic import TemplateView
from accounts.views import (ProfileEditView, ProfileView, UserSearchView,
TimtecUserViewSet, StudentSearchView)
Expand All @@ -32,6 +28,10 @@
from rest_framework import routers
from django_markdown import flatpages

# Uncomment the next two lines to enable the admin:
from django.contrib import admin as django_admin
django_admin.autodiscover()

flatpages.register()

router = routers.DefaultRouter(trailing_slash=False)
Expand Down
2 changes: 1 addition & 1 deletion timtec/wsgi.py
Expand Up @@ -14,6 +14,7 @@
"""
import os
from django.core.wsgi import get_wsgi_application

# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
# if running multiple sites in the same mod_wsgi process. To fix this, use
Expand All @@ -24,7 +25,6 @@
# This application object is used by any WSGI server configured to use this
# file. This includes Django's development server, if the WSGI_APPLICATION
# setting points here.
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()

# Apply WSGI middleware here.
Expand Down

0 comments on commit 0f604fc

Please sign in to comment.