Qu1003 (#621)

* use new peeringdb client (1.0.0) for pdb_load_data sync (#599)

* drop django-mobi for lack of py3/dj2 support (#492)
remove django-forms-bootstrap for lack of py3/dj2 support (#492)

* black formatted

* django2.2 and py3 upgrade (#492)

* drop ixlans (#21) ui and api changes

* drop local_asn (#168)

* org search (#193)

* phone number validation (#50)

* implement help text tooltips (#228)

* Mark own ASN as transit-free (#394)

* py3 fix for `pdb_migrate_ixlans` command when writing migration report

* pdb_migrate_ixlans: properly handle py3 Runtime error if ixlan dict changes during iteration

* set rest DEFAULT_SCHEMA_CLASS to coreapi to fix swagger apidocs
fix migration 0027 missing from facsimile manifest

* fix swagger doc strings

* fix tests that were broken from api doc fixes

* fix UniqueFieldValidator for netixlan ipaddress validation that broke during django/drf upgrade

* fix org merge tool layout issues

* travis config

* update pipfile and lock

* black formatting

* update travis dist

* beta mode banner (#411)

* add beta banner template (#411)

* automatically scheduled sync may not always be on, add a flag that lets us reflect that state in the beta banner message
clean up beta banner implementation (#411)

* add tests for beta banner (#411)

peeringdb_server/data_views.py

@@ -9,7 +9,7 @@ import datetime
 from django.contrib.auth.decorators import login_required
 from django.http import JsonResponse
 import django_countries
-import models
+from . import models
 import django_peeringdb.const as const
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
@@ -59,7 +59,7 @@ def countries_w_blank(request):
         {
             "countries_b": [{"id": "", "name": ""}]
             + [
-                {"id": unicode(code), "name": unicode(name)}
+                {"id": str(code), "name": str(name)}
                 for code, name in list(django_countries.countries)
             ]
         }
@@ -74,7 +74,7 @@ def countries(request):
     return JsonResponse(
         {
             "countries": [
-                {"id": unicode(code), "name": unicode(name)}
+                {"id": str(code), "name": str(name)}
                 for code, name in list(django_countries.countries)
             ]
         }
@@ -102,27 +102,13 @@ def facilities(request):
     return JsonResponse(
         {
             "facilities": [
-                {"id": fac.id, "name": unicode(fac.name)}
+                {"id": fac.id, "name": str(fac.name)}
                 for fac in models.Facility.handleref.all().undeleted().order_by("name")
             ]
         }
     )
 
 
-def decode(value):
-    """
-    django-peeringdb imports unicode literals from __future__,
-    while peeringdb_server does not at this point.
-
-    so we may get already decoded values for some enums
-    while others still need to be decoded.
-    """
-    try:
-        return value.decode("utf-8")
-    except UnicodeEncodeError:
-        return value
-
-
 def enum(request, name):
 
     if name.upper() not in [
@@ -157,7 +143,7 @@ def enum(request, name):
                     "id": id,
                     # as of django-peeringdb 1.0.0 already comes in
                     # translated
-                    "name": decode(n),
+                    "name": n,
                 }
                 for id, n in getattr(const, name.upper())
             ]