Merge pull request #259 from crucialfelix/feature/fix-six-py2-import

Feature/fix six py2 import
crucialfelix · Feb 11, 2020 · df4f675 · df4f675
2 parents cc5b136 + 2b64357
commit df4f675
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 30 deletions.
diff --git a/ajax_select/fields.py b/ajax_select/fields.py
@@ -2,7 +2,8 @@
 
 import json
 import sys
-from six import text_type
+
+from ajax_select.registry import registry
 from django import forms
 from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
@@ -14,7 +15,11 @@
 from django.utils.module_loading import import_string
 from django.utils.safestring import mark_safe
 
-from ajax_select.registry import registry
+try:
+    from six import text_type
+except ImportError:
+    from django.utils.six import text_type
+
 
 if sys.version_info.major >= 3:
     from django.utils.translation import gettext as _

diff --git a/ajax_select/static/ajax_select/css/ajax_select.css b/ajax_select/static/ajax_select/css/ajax_select.css
@@ -6,19 +6,19 @@
   padding: 0.25em 0;
 }
 form .aligned .results_on_deck {
-  padding-left: 38px;
-  margin-left: 7em;
+  padding-left: 14px;
+  margin-left: 160px;
 }
 .results_on_deck > div {
-  margin-bottom: 0.5em;
+  margin: 0.5em 0;
 }
 .ui-autocomplete-loading {
-  background:  url('../images/loading-indicator.gif') no-repeat;
+  background: url("../images/loading-indicator.gif") no-repeat;
   background-origin: content-box;
   background-position: right;
 }
 ul.ui-autocomplete {
-	/*
+  /*
   this is the dropdown menu.
 
   if max-width is not set and you are using django-admin

diff --git a/example/example/lookups.py b/example/example/lookups.py
@@ -1,12 +1,16 @@
 from __future__ import unicode_literals
 
+import ajax_select
+from ajax_select import LookupChannel
 from django.db.models import Q
 from django.utils.html import escape
-from django.utils.six import text_type
+
 from example.models import Group, Person, Song
 
-import ajax_select
-from ajax_select import LookupChannel
+try:
+    from six import text_type
+except ImportError:
+    from django.utils.six import text_type
 
 
 class PersonLookup(LookupChannel):

diff --git a/example/example/settings.py b/example/example/settings.py
@@ -63,7 +63,6 @@
 
 
 DEBUG = True
-TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
     # ('Your Name', '[email protected]'),
@@ -122,32 +121,26 @@
 
 ROOT_URLCONF = 'example.urls'
 
-# Django < 1.8
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates"
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
+ROOT_URLCONF = "example.urls"
 
-# Django >= 1.8
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [
             # insert your TEMPLATE_DIRS here
         ],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
                 # Insert your TEMPLATE_CONTEXT_PROCESSORS here or use this
                 # list if you haven't customized them:
-                'django.contrib.auth.context_processors.auth',
-                'django.template.context_processors.debug',
-                'django.template.context_processors.i18n',
-                'django.template.context_processors.media',
-                'django.template.context_processors.static',
-                'django.template.context_processors.tz',
-                'django.contrib.messages.context_processors.messages',
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.debug",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+                "django.template.context_processors.tz",
+                "django.contrib.messages.context_processors.messages",
             ],
         },
         # TEMPLATE_LOADERS = (