diff --git a/bin/swh-web-dev b/bin/swh-web-dev index 0a6bfe073797c28231f6389578fbe4c5187f4c3e..15c30c8ab228fb6f5b2e3787f7e475813b67f52d 100755 --- a/bin/swh-web-dev +++ b/bin/swh-web-dev @@ -10,13 +10,17 @@ import argparse import django import os -from django.core import management +# need to setup django settings before importing django modules +# with django 1.7 (debian jessie) +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "swh.web.settings") # noqa -from django.core.management.commands.runserver import ( +from django.core import management # noqa + +from django.core.management.commands.runserver import ( # noqa Command as runserver ) -from swh.web import config +from swh.web import config # noqa # Default configuration file DEFAULT_CONF_FILE = '~/.config/swh/webapp.yml' @@ -40,6 +44,5 @@ if __name__ == '__main__': swh_web_config = config.get_config(config_path) runserver.default_port = swh_web_config['port'] runserver.default_addr = swh_web_config['host'] - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "swh.web.settings") django.setup() management.call_command('runserver') diff --git a/swh/web/api/templates/apidoc.html b/swh/web/api/templates/apidoc.html index cf519977d2e913e462c90346748c3bad02770d44..ed2073091fc5e52785e14c6f55aab89bf4d25c33 100644 --- a/swh/web/api/templates/apidoc.html +++ b/swh/web/api/templates/apidoc.html @@ -18,7 +18,7 @@ {{ docstring | safe_docstring_display | safe }} </div> {% endif %} -{% if response_data and response_data is not none %} +{% if response_data %} <div class="response-data"> <h2>Request</h2> <pre><strong>{{ request.method }}</strong> {{ request.build_absolute_uri }}</pre> @@ -28,7 +28,7 @@ <h3>Status Code</h3> <pre class="error">{{ status_code }}</pre> {% endif %} - {% if headers_data and headers_data is not none %} + {% if headers_data %} <h3>Headers</h3> {% for header_name, header_value in headers_data.items %} <pre><strong>{{ header_name }}</strong> {{ header_value | urlize_header_links | safe }}</pre> diff --git a/swh/web/settings.py b/swh/web/settings.py index 19144893b9d1ba1724e4749fec7d0fed02da5433..ec0df99320c921fe1c55580b73693746c9fce32b 100644 --- a/swh/web/settings.py +++ b/swh/web/settings.py @@ -181,3 +181,5 @@ LOGGING = { }, }, } + +SILENCED_SYSTEM_CHECKS = ['1_7.W001']