nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

PEP8 fixes

Browse Source
This commit is contained in:
James Valleroy 2015-04-04 14:40:44 -04:00 committed by Sunil Mohan Adapa
parent 35dcde00de
commit 57e5799880
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plinth/modules/ikiwiki/urls.py
View File

@ -26,6 +26,7 @@ urlpatterns = patterns(
'plinth.modules.ikiwiki.views', 'plinth.modules.ikiwiki.views',
url(r'^apps/ikiwiki/$', 'index', name='index'), url(r'^apps/ikiwiki/$', 'index', name='index'),
url(r'^apps/ikiwiki/manage/$', 'manage', name='manage'), url(r'^apps/ikiwiki/manage/$', 'manage', name='manage'),
url(r'^apps/ikiwiki/(?P<name>[\w.@+-]+)/delete/$', 'delete', name='delete'), url(r'^apps/ikiwiki/(?P<name>[\w.@+-]+)/delete/$',
'delete', name='delete'),
url(r'^apps/ikiwiki/create/$', 'create', name='create'), url(r'^apps/ikiwiki/create/$', 'create', name='create'),
) )

14
plinth/modules/ikiwiki/views.py
View File

@ -25,16 +25,12 @@ from django.core.urlresolvers import reverse_lazy
from django.shortcuts import redirect from django.shortcuts import redirect
from django.template.response import TemplateResponse from django.template.response import TemplateResponse
from gettext import gettext as _ from gettext import gettext as _
import logging
from .forms import IkiwikiForm, IkiwikiCreateForm from .forms import IkiwikiForm, IkiwikiCreateForm
from plinth import actions from plinth import actions
from plinth import package from plinth import package
from plinth.modules import ikiwiki
LOGGER = logging.getLogger(__name__)
subsubmenu = [{'url': reverse_lazy('ikiwiki:index'), subsubmenu = [{'url': reverse_lazy('ikiwiki:index'),
'text': _('Configure')}, 'text': _('Configure')},
{'url': reverse_lazy('ikiwiki:manage'), {'url': reverse_lazy('ikiwiki:manage'),
@ -44,7 +40,9 @@ subsubmenu = [{'url': reverse_lazy('ikiwiki:index'),
@login_required @login_required
@package.required(['ikiwiki', 'libcgi-formbuilder-perl', 'libcgi-session-perl']) @package.required(['ikiwiki',
'libcgi-formbuilder-perl',
'libcgi-session-perl'])
def index(request): def index(request):
"""Serve configuration page.""" """Serve configuration page."""
status = get_status() status = get_status()
@ -131,11 +129,10 @@ def create(request):
def _create_wiki(request, name, admin_name, admin_password): def _create_wiki(request, name, admin_name, admin_password):
"""Create wiki.""" """Create wiki."""
try: try:
output = actions.superuser_run( actions.superuser_run(
'ikiwiki', 'ikiwiki',
['create-wiki', '--wiki_name', name, ['create-wiki', '--wiki_name', name,
'--admin_name', admin_name, '--admin_password', admin_password]) '--admin_name', admin_name, '--admin_password', admin_password])
#LOGGER.info('create wiki: %s' % output)
messages.success(request, _('Created wiki %s.') % name) messages.success(request, _('Created wiki %s.') % name)
except actions.ActionError as err: except actions.ActionError as err:
messages.error(request, _('Could not create wiki: %s') % err) messages.error(request, _('Could not create wiki: %s') % err)
@ -144,11 +141,10 @@ def _create_wiki(request, name, admin_name, admin_password):
def _create_blog(request, name, admin_name, admin_password): def _create_blog(request, name, admin_name, admin_password):
"""Create blog.""" """Create blog."""
try: try:
output = actions.superuser_run( actions.superuser_run(
'ikiwiki', 'ikiwiki',
['create-blog', '--blog_name', name, ['create-blog', '--blog_name', name,
'--admin_name', admin_name, '--admin_password', admin_password]) '--admin_name', admin_name, '--admin_password', admin_password])
#LOGGER.info('create blog: %s' % output)
messages.success(request, _('Created blog %s.') % name) messages.success(request, _('Created blog %s.') % name)
except actions.ActionError as err: except actions.ActionError as err:
messages.error(request, _('Could not create blog: %s') % err) messages.error(request, _('Could not create blog: %s') % err)