Add from __future__ import unicode_literals, issue #37

mayan/apps/main/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_lazy as _
 
@@ -8,6 +8,6 @@ from project_tools.api import register_tool
 
 from .links import admin_site, maintenance_menu
 
-register_top_menu('home', link={'text': _(u'Home'), 'view': 'main:home', 'famfam': 'house'}, position=0)
+register_top_menu('home', link={'text': _('Home'), 'view': 'main:home', 'famfam': 'house'}, position=0)
 register_setup(admin_site)
 register_tool(maintenance_menu)

mayan/apps/main/api.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.core.urlresolvers import reverse
 from django.utils.functional import lazy
 

mayan/apps/main/links.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.utils.translation import ugettext_lazy as _
 
 
@@ -5,5 +7,5 @@ def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
 
 
-maintenance_menu = {'text': _(u'Maintenance'), 'view': 'main:maintenance_menu', 'famfam': 'wrench', 'icon': 'wrench.png'}
-admin_site = {'text': _(u'Admin site'), 'view': 'admin:index', 'famfam': 'keyboard', 'icon': 'keyboard.png', 'condition': is_superuser}
+maintenance_menu = {'text': _('Maintenance'), 'view': 'main:maintenance_menu', 'famfam': 'wrench', 'icon': 'wrench.png'}
+admin_site = {'text': _('Admin site'), 'view': 'admin:index', 'famfam': 'keyboard', 'icon': 'keyboard.png', 'condition': is_superuser}

mayan/apps/main/management/commands/initialsetup.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import os
 
 from django.conf import settings

mayan/apps/main/templatetags/styling.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django import forms
 from django.template import Library, Node, Variable
 
@@ -14,16 +16,16 @@ class StylingNode(Node):
 
             if isinstance(field.widget, forms.widgets.TextInput):
                 # Don't overwrite any existing CSS class, append
-                css_class = field.widget.attrs.get('class', u'text_field')
-                field.widget.attrs['class'] = u' '.join([css_class, 'text_field'])
+                css_class = field.widget.attrs.get('class', 'text_field')
+                field.widget.attrs['class'] = ' '.join([css_class, 'text_field'])
             elif isinstance(field.widget, forms.widgets.PasswordInput):
                 # Don't overwrite any existing CSS class, append
-                css_class = field.widget.attrs.get('class', u'text_field')
-                field.widget.attrs['class'] = u' '.join([css_class, 'text_field'])
+                css_class = field.widget.attrs.get('class', 'text_field')
+                field.widget.attrs['class'] = ' '.join([css_class, 'text_field'])
             elif isinstance(field.widget, forms.widgets.Textarea):
                 # Don't overwrite any existing CSS class, append
-                css_class = field.widget.attrs.get('class', u'text_area')
-                field.widget.attrs['class'] = u' '.join([css_class, 'text_area'])
+                css_class = field.widget.attrs.get('class', 'text_area')
+                field.widget.attrs['class'] = ' '.join([css_class, 'text_area'])
 
         context[self.form_name] = form
         return ''

mayan/apps/main/templatetags/theme_tags.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
 
 from django.conf import settings
 from django.core.urlresolvers import reverse

mayan/apps/main/urls.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.conf.urls import patterns, url
 
 urlpatterns = patterns('main.views',

mayan/apps/main/views.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
@@ -29,7 +29,7 @@ def home(request):
         context.update({
             'object_list': queryset,
             'time_delta': timedelta,
-            'title': _(u'Results'),
+            'title': _('Results'),
         })
 
     return render_to_response('main/home.html', context, context_instance=RequestContext(request))
@@ -52,12 +52,12 @@ def maintenance_menu(request):
 
     return render_to_response('main/tools.html', {
         'blocks': user_tools,
-        'title': _(u'Maintenance menu')
+        'title': _('Maintenance menu')
     }, context_instance=RequestContext(request))
 
 
 def diagnostics_view(request):
     return render_to_response('main/diagnostics.html', {
         'blocks': diagnostics,
-        'title': _(u'Diagnostics')
+        'title': _('Diagnostics')
     }, context_instance=RequestContext(request))