diff options
Diffstat (limited to 'rpki/gui')
| -rw-r--r-- | rpki/gui/app/check_expired.py | 2 | ||||
| -rw-r--r-- | rpki/gui/app/urls.py | 10 | ||||
| -rw-r--r-- | rpki/gui/cacheview/misc.py | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/rpki/gui/app/check_expired.py b/rpki/gui/app/check_expired.py index e869f31b..eda21c0c 100644 --- a/rpki/gui/app/check_expired.py +++ b/rpki/gui/app/check_expired.py @@ -111,7 +111,7 @@ def check_child_certs(conf, errs): pdus = z.call_rpkid(req) for pdu in pdus: if isinstance(pdu, report_error_elt): - logger.error("rpkid reported an error: %s" % pdu.error_code) + logger.error("rpkid reported an error: %s", pdu.error_code) elif isinstance(pdu, list_published_objects_elt): if pdu.uri.endswith('.cer'): cert = X509() diff --git a/rpki/gui/app/urls.py b/rpki/gui/app/urls.py index f70667df..be5cb346 100644 --- a/rpki/gui/app/urls.py +++ b/rpki/gui/app/urls.py @@ -79,17 +79,17 @@ urlpatterns = patterns( (r'^user/(?P<pk>\d+)/delete$', views.user_delete), (r'^user/(?P<pk>\d+)/edit$', views.user_edit), - url(r'^user/password/reset/$', - 'django.contrib.auth.views.password_reset', + url(r'^user/password/reset/$', + 'django.contrib.auth.views.password_reset', #{'post_reset_redirect' : '/user/password/reset/done/'}, {'extra_context': {'form_title': 'Password Reset'}}, name="password_reset"), (r'^user/password/reset/done/$', 'django.contrib.auth.views.password_reset_done'), - url(r'^user/password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', - 'django.contrib.auth.views.password_reset_confirm', + url(r'^user/password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', + 'django.contrib.auth.views.password_reset_confirm', #{'post_reset_redirect' : '/user/password/done/'}, name="password_reset_confirm"), - (r'^user/password/done/$', + (r'^user/password/done/$', 'django.contrib.auth.views.password_reset_complete'), ) diff --git a/rpki/gui/cacheview/misc.py b/rpki/gui/cacheview/misc.py index 9a69645c..54431224 100644 --- a/rpki/gui/cacheview/misc.py +++ b/rpki/gui/cacheview/misc.py @@ -1,9 +1,9 @@ # Copyright (C) 2011 SPARTA, Inc. dba Cobham Analytic Solutions -# +# # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. -# +# # THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH # REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY # AND FITNESS. IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT, |