NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-18 11:22:25 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Import unicode_literals

Browse Source
This commit is contained in:
Jeremy Stretch
2017-05-24 11:33:11 -04:00
parent 9aad8a7774
commit f21c6bca00
109 changed files with 320 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/utilities/api.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.conf import settings
from django.contrib.contenttypes.models import ContentType

2
netbox/utilities/context_processors.py
View File

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

10
netbox/utilities/error_handlers.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.contrib import messages
from django.utils.html import escape
from django.utils.safestring import mark_safe
@@ -14,12 +16,12 @@ def handle_protectederror(obj, request, e):
# Grammar for single versus multiple triggering objects
if type(obj) in (list, tuple):
err_message = u"Unable to delete the requested {}. The following dependent {} were found: ".format(
err_message = "Unable to delete the requested {}. The following dependent {} were found: ".format(
obj[0]._meta.verbose_name_plural,
dep_class,
)
else:
err_message = u"Unable to delete {} {}. The following dependent {} were found: ".format(
err_message = "Unable to delete {} {}. The following dependent {} were found: ".format(
obj._meta.verbose_name,
obj,
dep_class,
@@ -29,9 +31,9 @@ def handle_protectederror(obj, request, e):
dependent_objects = []
for obj in e.protected_objects:
if hasattr(obj, 'get_absolute_url'):
dependent_objects.append(u'<a href="{}">{}</a>'.format(obj.get_absolute_url(), escape(obj)))
dependent_objects.append('<a href="{}">{}</a>'.format(obj.get_absolute_url(), escape(obj)))
else:
dependent_objects.append(str(obj))
err_message += u', '.join(dependent_objects)
err_message += ', '.join(dependent_objects)
messages.error(request, mark_safe(err_message))

2
netbox/utilities/fields.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.core.validators import RegexValidator
from django.db import models

2
netbox/utilities/filters.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
import django_filters
import itertools

3
netbox/utilities/forms.py
View File

@@ -1,3 +1,4 @@
from __future__ import unicode_literals
import csv
import itertools
import re
@@ -373,7 +374,7 @@ class FilterChoiceFieldMixin(object):
def label_from_instance(self, obj):
label = super(FilterChoiceFieldMixin, self).label_from_instance(obj)
if hasattr(obj, 'filter_count'):
return u'{} ({})'.format(label, obj.filter_count)
return '{} ({})'.format(label, obj.filter_count)
return label
def _get_choices(self):

2
netbox/utilities/managers.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.db.models import Manager

2
netbox/utilities/middleware.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.http import HttpResponseRedirect
from django.conf import settings
from django.urls import reverse

2
netbox/utilities/models.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.db import models

2
netbox/utilities/paginator.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.conf import settings
from django.core.paginator import Paginator, Page

2
netbox/utilities/sql.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
from django.db import connections, models
from django.db.models.sql.compiler import SQLCompiler

2
netbox/utilities/tables.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
import django_tables2 as tables
from django.utils.safestring import mark_safe

2
netbox/utilities/tests.py
View File

@@ -1,3 +1,5 @@
from __future__ import unicode_literals
class HttpStatusMixin(object):
"""
Custom mixin to provide more detail in the event of an unexpected HTTP response.

13
netbox/utilities/utils.py
View File

@@ -1,3 +1,4 @@
from __future__ import unicode_literals
import six
@@ -10,20 +11,20 @@ def csv_format(data):
# Represent None or False with empty string
if value in [None, False]:
csv.append(u'')
csv.append('')
continue
# Force conversion to string first so we can check for any commas
if not isinstance(value, six.string_types):
value = u'{}'.format(value)
value = '{}'.format(value)
# Double-quote the value if it contains a comma
if u',' in value:
csv.append(u'"{}"'.format(value))
if ',' in value:
csv.append('"{}"'.format(value))
else:
csv.append(u'{}'.format(value))
csv.append('{}'.format(value))
return u','.join(csv)
return ','.join(csv)
def foreground_color(bg_color):

27
netbox/utilities/views.py
View File

@@ -1,4 +1,6 @@
from __future__ import unicode_literals
from collections import OrderedDict
from django_tables2 import RequestConfig
from django.conf import settings
@@ -17,7 +19,6 @@ from django.utils.safestring import mark_safe
from django.views.generic import View
from extras.models import CustomField, CustomFieldValue, ExportTemplate, UserAction
from .error_handlers import handle_protectederror
from .forms import ConfirmationForm
from .paginator import EnhancedPaginator
@@ -95,7 +96,7 @@ class ObjectListView(View):
filename='netbox_{}'.format(model._meta.verbose_name_plural))
return response
except TemplateSyntaxError:
messages.error(request, u"There was an error rendering the selected export template ({})."
messages.error(request, "There was an error rendering the selected export template ({})."
.format(et.name))
# Fall back to built-in CSV export
elif 'export' in request.GET and hasattr(model, 'to_csv'):
@@ -196,12 +197,12 @@ class ObjectEditView(GetReturnURLMixin, View):
obj_created = not form.instance.pk
obj = form.save()
msg = u'Created ' if obj_created else u'Modified '
msg = 'Created ' if obj_created else 'Modified '
msg += self.model._meta.verbose_name
if hasattr(obj, 'get_absolute_url'):
msg = u'{} <a href="{}">{}</a>'.format(msg, obj.get_absolute_url(), escape(obj))
msg = '{} <a href="{}">{}</a>'.format(msg, obj.get_absolute_url(), escape(obj))
else:
msg = u'{} {}'.format(msg, escape(obj))
msg = '{} {}'.format(msg, escape(obj))
messages.success(request, mark_safe(msg))
if obj_created:
UserAction.objects.log_create(request.user, obj, msg)
@@ -267,7 +268,7 @@ class ObjectDeleteView(GetReturnURLMixin, View):
handle_protectederror(obj, request, e)
return redirect(obj.get_absolute_url())
msg = u'Deleted {} {}'.format(self.model._meta.verbose_name, obj)
msg = 'Deleted {} {}'.format(self.model._meta.verbose_name, obj)
messages.success(request, msg)
UserAction.objects.log_delete(request.user, obj, msg)
@@ -347,7 +348,7 @@ class BulkAddView(View):
raise IntegrityError()
# If we make it to this point, validation has succeeded on all new objects.
msg = u"Added {} {}".format(len(new_objs), model._meta.verbose_name_plural)
msg = "Added {} {}".format(len(new_objs), model._meta.verbose_name_plural)
messages.success(request, msg)
UserAction.objects.log_bulk_create(request.user, ContentType.objects.get_for_model(model), msg)
@@ -400,7 +401,7 @@ class BulkImportView(View):
obj_table = self.table(new_objs)
if new_objs:
msg = u'Imported {} {}'.format(len(new_objs), new_objs[0]._meta.verbose_name_plural)
msg = 'Imported {} {}'.format(len(new_objs), new_objs[0]._meta.verbose_name_plural)
messages.success(request, msg)
UserAction.objects.log_import(request.user, ContentType.objects.get_for_model(new_objs[0]), msg)
@@ -493,7 +494,7 @@ class BulkEditView(View):
updated_count = objs_updated
if updated_count:
msg = u'Updated {} {}'.format(updated_count, self.cls._meta.verbose_name_plural)
msg = 'Updated {} {}'.format(updated_count, self.cls._meta.verbose_name_plural)
messages.success(self.request, msg)
UserAction.objects.log_bulk_edit(request.user, ContentType.objects.get_for_model(self.cls), msg)
return redirect(return_url)
@@ -505,7 +506,7 @@ class BulkEditView(View):
selected_objects = self.cls.objects.filter(pk__in=pk_list)
if not selected_objects:
messages.warning(request, u"No {} were selected.".format(self.cls._meta.verbose_name_plural))
messages.warning(request, "No {} were selected.".format(self.cls._meta.verbose_name_plural))
return redirect(return_url)
return render(request, self.template_name, {
@@ -530,7 +531,7 @@ class BulkEditView(View):
objs_updated = True
# Updating the value of the field
elif form.cleaned_data[name] not in [None, u'']:
elif form.cleaned_data[name] not in [None, '']:
# Check for zero value (bulk editing)
if isinstance(form.fields[name], TypedChoiceField) and form.cleaned_data[name] == 0:
@@ -618,7 +619,7 @@ class BulkDeleteView(View):
handle_protectederror(list(queryset), request, e)
return redirect(return_url)
msg = u'Deleted {} {}'.format(deleted_count, self.cls._meta.verbose_name_plural)
msg = 'Deleted {} {}'.format(deleted_count, self.cls._meta.verbose_name_plural)
messages.success(request, msg)
UserAction.objects.log_bulk_delete(request.user, ContentType.objects.get_for_model(self.cls), msg)
return redirect(return_url)
@@ -628,7 +629,7 @@ class BulkDeleteView(View):
selected_objects = self.cls.objects.filter(pk__in=pk_list)
if not selected_objects:
messages.warning(request, u"No {} were selected for deletion.".format(self.cls._meta.verbose_name_plural))
messages.warning(request, "No {} were selected for deletion.".format(self.cls._meta.verbose_name_plural))
return redirect(return_url)
return render(request, self.template_name, {