Unicode handling cleanup

netbox/circuits/models.py

@@ -80,7 +80,7 @@ class Circuit(CreatedUpdatedModel):
         unique_together = ['provider', 'cid']
 
     def __unicode__(self):
-        return "{0} {1}".format(self.provider, self.cid)
+        return u'{} {}'.format(self.provider, self.cid)
 
     def get_absolute_url(self):
         return reverse('circuits:circuit', args=[self.pk])

netbox/dcim/models.py

@@ -206,7 +206,7 @@ class RackGroup(models.Model):
         ]
 
     def __unicode__(self):
-        return '{} - {}'.format(self.site.name, self.name)
+        return u'{} - {}'.format(self.site.name, self.name)
 
     def get_absolute_url(self):
         return "{}?group_id={}".format(reverse('dcim:rack_list'), self.pk)
@@ -404,7 +404,7 @@ class DeviceType(models.Model):
         ]
 
     def __unicode__(self):
-        return "{} {}".format(self.manufacturer, self.model)
+        return u'{} {}'.format(self.manufacturer, self.model)
 
     def get_absolute_url(self):
         return reverse('dcim:devicetype', args=[self.pk])
@@ -965,7 +965,7 @@ class DeviceBay(models.Model):
         unique_together = ['device', 'name']
 
     def __unicode__(self):
-        return '{} - {}'.format(self.device.name, self.name)
+        return u'{} - {}'.format(self.device.name, self.name)
 
     def clean(self):
 

netbox/ipam/models.py

@@ -385,7 +385,7 @@ class VLANGroup(models.Model):
         verbose_name_plural = 'VLAN groups'
 
     def __unicode__(self):
-        return '{} - {}'.format(self.site.name, self.name)
+        return u'{} - {}'.format(self.site.name, self.name)
 
     def get_absolute_url(self):
         return "{}?group_id={}".format(reverse('ipam:vlan_list'), self.pk)
@@ -442,7 +442,7 @@ class VLAN(CreatedUpdatedModel):
 
     @property
     def display_name(self):
-        return u"{} ({})".format(self.vid, self.name)
+        return u'{} ({})'.format(self.vid, self.name)
 
     def get_status_class(self):
         return STATUS_CHOICE_CLASSES[self.status]

netbox/secrets/models.py

@@ -219,8 +219,8 @@ class Secret(CreatedUpdatedModel):
 
     def __unicode__(self):
         if self.role and self.device:
-            return "{} for {}".format(self.role, self.device)
-        return "Secret"
+            return u'{} for {}'.format(self.role, self.device)
+        return u'Secret'
 
     def get_absolute_url(self):
         return reverse('secrets:secret', args=[self.pk])

netbox/utilities/forms.py

@@ -60,7 +60,7 @@ class SelectWithDisabled(forms.Select):
             option_label = option_label['label']
         disabled_html = ' disabled="disabled"' if option_disabled else ''
 
-        return format_html('<option value="{}"{}{}>{}</option>',
+        return format_html(u'<option value="{}"{}{}>{}</option>',
                            option_value,
                            selected_html,
                            disabled_html,

netbox/utilities/views.py

@@ -134,12 +134,12 @@ class ObjectEditView(View):
             obj_created = not obj.pk
             obj.save()
 
-            msg = 'Created ' if obj_created else 'Modified '
+            msg = u'Created ' if obj_created else u'Modified '
             msg += self.model._meta.verbose_name
             if hasattr(obj, 'get_absolute_url'):
-                msg = '{} <a href="{}">{}</a>'.format(msg, obj.get_absolute_url(), obj)
+                msg = u'{} <a href="{}">{}</a>'.format(msg, obj.get_absolute_url(), obj)
             else:
-                msg = '{} {}'.format(msg, obj)
+                msg = u'{} {}'.format(msg, obj)
             messages.success(request, msg)
             if obj_created:
                 UserAction.objects.log_create(request.user, obj, msg)
@@ -192,7 +192,7 @@ class ObjectDeleteView(View):
         if form.is_valid():
             try:
                 obj.delete()
-                msg = 'Deleted {} {}'.format(self.model._meta.verbose_name, obj)
+                msg = u'Deleted {} {}'.format(self.model._meta.verbose_name, obj)
                 messages.success(request, msg)
                 UserAction.objects.log_delete(request.user, obj, msg)
                 return redirect(self.redirect_url)
@@ -234,7 +234,7 @@ class BulkImportView(View):
 
                 obj_table = self.table(new_objs)
                 if new_objs:
-                    msg = 'Imported {} {}'.format(len(new_objs), new_objs[0]._meta.verbose_name_plural)
+                    msg = u'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)
 
@@ -281,7 +281,7 @@ class BulkEditView(View):
             if form.is_valid():
                 updated_count = self.update_objects(pk_list, form)
                 if updated_count:
-                    msg = 'Updated {} {}'.format(updated_count, self.cls._meta.verbose_name_plural)
+                    msg = u'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(redirect_url)
@@ -345,7 +345,7 @@ class BulkDeleteView(View):
                     handle_protectederror(list(queryset), request, e)
                     return redirect(redirect_url)
 
-                msg = 'Deleted {} {}'.format(deleted_count, self.cls._meta.verbose_name_plural)
+                msg = u'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(redirect_url)