matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP8 cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2011-04-11 12:18:35 -04:00
parent 95f17a4307
commit 524115de64
6 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/main/__init__.py
View File

@@ -32,4 +32,3 @@ if not SIDE_BAR_SEARCH:
main_menu.insert(1, {'text': _(u'search'), 'view': 'search', 'famfam': 'zoom', 'position': 2}) main_menu.insert(1, {'text': _(u'search'), 'view': 'search', 'famfam': 'zoom', 'position': 2})
register_menu(main_menu) register_menu(main_menu)

1
apps/main/api.py
View File

@@ -1,5 +1,6 @@
diagnostics = {} diagnostics = {}
def register_diagnostic(namespace, title, link): def register_diagnostic(namespace, title, link):
namespace_dict = diagnostics.get(namespace, {'title': None, 'links': []}) namespace_dict = diagnostics.get(namespace, {'title': None, 'links': []})
namespace_dict['title'] = title namespace_dict['title'] = title

1
apps/main/conf/settings.py
View File

@@ -1,4 +1,3 @@
from django.conf import settings from django.conf import settings
SIDE_BAR_SEARCH = getattr(settings, 'MAIN_SIDE_BAR_SEARCH', False) SIDE_BAR_SEARCH = getattr(settings, 'MAIN_SIDE_BAR_SEARCH', False)

7
apps/main/templatetags/main_settings_tags.py
View File

@@ -11,6 +11,7 @@ class SettingsNode(Node):
def __init__(self, format_string, var_name): def __init__(self, format_string, var_name):
self.format_string = format_string self.format_string = format_string
self.var_name = var_name self.var_name = var_name
def render(self, context): def render(self, context):
context[self.var_name] = getattr(settings, self.format_string, '') context[self.var_name] = getattr(settings, self.format_string, '')
return '' return ''
@@ -23,11 +24,11 @@ def get_main_setting(parser, token):
# Splitting by None == splitting by spaces. # Splitting by None == splitting by spaces.
tag_name, arg = token.contents.split(None, 1) tag_name, arg = token.contents.split(None, 1)
except ValueError: except ValueError:
raise TemplateSyntaxError, "%r tag requires arguments" % token.contents.split()[0] raise TemplateSyntaxError('%r tag requires arguments' % token.contents.split()[0])
m = re.search(r'(.*?) as (\w+)', arg) m = re.search(r'(.*?) as (\w+)', arg)
if not m: if not m:
raise TemplateSyntaxError, "%r tag had invalid arguments" % tag_name raise TemplateSyntaxError('%r tag had invalid arguments' % tag_name)
format_string, var_name = m.groups() format_string, var_name = m.groups()
if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")): if not (format_string[0] == format_string[-1] and format_string[0] in ('"', "'")):
raise TemplateSyntaxError, "%r tag's argument should be in quotes" % tag_name raise TemplateSyntaxError('%r tag\'s argument should be in quotes' % tag_name)
return SettingsNode(format_string[1:-1], var_name) return SettingsNode(format_string[1:-1], var_name)

2
apps/main/urls.py
View File

@@ -1,4 +1,4 @@
from django.conf.urls.defaults import * from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('main.views', urlpatterns = patterns('main.views',

1
apps/main/views.py
View File

@@ -17,6 +17,7 @@ from dynamic_search.conf import settings as search_settings
from main.api import diagnostics from main.api import diagnostics
def home(request): def home(request):
return render_to_response('home.html', {}, return render_to_response('home.html', {},
context_instance=RequestContext(request)) context_instance=RequestContext(request))