Fix PEP8 formatting errors

This commit is contained in:
Pavel Korovin 2016-07-11 03:31:22 +03:00
parent 627b7fa763
commit ed3917914f
2 changed files with 29 additions and 29 deletions

View File

@ -34,12 +34,12 @@ SECRET_KEY = ''
# URL prefix if NetBox is served from non-root location, e.g. http://mysite/netbox/
# By default, URL_PREFIX = '/', i.e. NetBox is served from root location
#URL_PREFIX = '/netbox'
# URL_PREFIX = '/netbox'
# Directory and URL from which static files will be served
# for more info, see https://docs.djangoproject.com/en/1.9/howto/static-files/
#STATIC_ROOT = '/var/www/htdocs/netbox/static/'
#STATIC_URL = '/static/netbox/'
# STATIC_ROOT = '/var/www/htdocs/netbox/static/'
# STATIC_URL = '/static/netbox/'
# Specify one or more name and email address tuples representing NetBox administrators. These people will be notified of
# application errors (assuming correct email settings are provided).

View File

@ -11,35 +11,35 @@ if settings.URL_PREFIX.strip('/'):
url_prefix = '{0}/'.format(settings.URL_PREFIX.strip('/'))
urlpatterns = [
url(r'^{0}'.format(url_prefix),
include([
# Default page
url(r'^$', home, name='home'),
url(r'^{0}'.format(url_prefix),
include([
# Default page
url(r'^$', home, name='home'),
# Login/logout
url(r'^login/$', login, name='login'),
url(r'^logout/$', logout, name='logout'),
# Login/logout
url(r'^login/$', login, name='login'),
url(r'^logout/$', logout, name='logout'),
# Apps
url(r'^circuits/', include('circuits.urls', namespace='circuits')),
url(r'^dcim/', include('dcim.urls', namespace='dcim')),
url(r'^ipam/', include('ipam.urls', namespace='ipam')),
url(r'^secrets/', include('secrets.urls', namespace='secrets')),
url(r'^profile/', include('users.urls', namespace='users')),
# Apps
url(r'^circuits/', include('circuits.urls', namespace='circuits')),
url(r'^dcim/', include('dcim.urls', namespace='dcim')),
url(r'^ipam/', include('ipam.urls', namespace='ipam')),
url(r'^secrets/', include('secrets.urls', namespace='secrets')),
url(r'^profile/', include('users.urls', namespace='users')),
# API
url(r'^api/circuits/', include('circuits.api.urls', namespace='circuits-api')),
url(r'^api/dcim/', include('dcim.api.urls', namespace='dcim-api')),
url(r'^api/ipam/', include('ipam.api.urls', namespace='ipam-api')),
url(r'^api/secrets/', include('secrets.api.urls', namespace='secrets-api')),
url(r'^api/docs/', include('rest_framework_swagger.urls')),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
# API
url(r'^api/circuits/', include('circuits.api.urls', namespace='circuits-api')),
url(r'^api/dcim/', include('dcim.api.urls', namespace='dcim-api')),
url(r'^api/ipam/', include('ipam.api.urls', namespace='ipam-api')),
url(r'^api/secrets/', include('secrets.api.urls', namespace='secrets-api')),
url(r'^api/docs/', include('rest_framework_swagger.urls')),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
# Error testing
url(r'^404/$', page_not_found),
url(r'^500/$', trigger_500),
# Error testing
url(r'^404/$', page_not_found),
url(r'^500/$', trigger_500),
# Admin
url(r'^admin/', include(admin.site.urls)),
])),
# Admin
url(r'^admin/', include(admin.site.urls)),
])),
]