remove all occurences of six

Author: jrief

djng/core/urlresolvers.py

@@ -1,6 +1,5 @@
 from inspect import isclass
 
-import six
 from django.urls import (get_resolver, get_urlconf, resolve, reverse, NoReverseMatch)
 from django.core.exceptions import ImproperlyConfigured
 
@@ -36,7 +35,7 @@ def get_all_remote_methods(resolver=None, ns_prefix=''):
  resolver = get_resolver(get_urlconf())
  result = {}
  for name in resolver.reverse_dict.keys():
- if not isinstance(name, six.string_types):
+ if not isinstance(name, str):
  continue
  try:
  url = reverse(ns_prefix + name)

djng/forms/__init__.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.forms.forms import DeclarativeFieldsMetaclass, BaseForm
 from django.forms.models import BaseModelForm, ModelFormMetaclass
-import six
 from .angular_base import BaseFieldsModifierMetaclass, NgFormBaseMixin
 from .angular_model import NgModelFormMixin
 from .angular_validation import NgFormValidationMixin
@@ -11,7 +10,7 @@ class NgDeclarativeFieldsMetaclass(BaseFieldsModifierMetaclass, DeclarativeField
  pass
 
 
-class NgForm(six.with_metaclass(NgDeclarativeFieldsMetaclass, NgFormBaseMixin, BaseForm)):
+class NgForm(NgFormBaseMixin, BaseForm, metaclass=NgDeclarativeFieldsMetaclass):
  """
  Convenience class to be used instead of Django's internal ``forms.Form`` when declaring
  a form to be used with AngularJS.
@@ -22,7 +21,7 @@ class NgModelFormMetaclass(BaseFieldsModifierMetaclass, ModelFormMetaclass):
  pass
 
 
-class NgModelForm(six.with_metaclass(NgModelFormMetaclass, NgFormBaseMixin, BaseModelForm)):
+class NgModelForm(NgFormBaseMixin, BaseModelForm, metaclass=NgModelFormMetaclass):
  """
  Convenience class to be used instead of Django's internal ``forms.ModelForm`` when declaring
  a model form to be used with AngularJS.

djng/forms/angular_base.py

@@ -11,7 +11,6 @@
 from django import VERSION as DJANGO_VERSION
 from django.forms import forms
 from django.http import QueryDict
-import six
 try:
  from importlib import import_module
 except ImportError:
@@ -294,10 +293,8 @@ def __init__(self, *args, **kwargs):
  try:
  form_name = self.form_name
  except AttributeError:
- # if form_name is unset, then generate a pseudo unique name, based upon the class name
- form_name = b64encode(six.b(self.__class__.__name__)).rstrip(six.b('='))
- if six.PY3:
- form_name = form_name.decode('utf-8')
+ # if form_name is unset, generate a pseudo unique name, based upon the class name
+ form_name = b64encode(self.__class__.__name__.encode()).rstrip(b'=').decode('utf-8')
  self.form_name = kwargs.pop('form_name', form_name)
  error_class = kwargs.pop('error_class', TupleErrorList)
  kwargs.setdefault('error_class', error_class)

djng/middleware.py

@@ -1,4 +1,3 @@
-import six
 from django import http
 from django.urls import reverse
 from django.utils.http import unquote
@@ -62,10 +61,7 @@ def process_request(self, request):
  for key in request.GET:
  if key.startswith('djng_url'):
  query.pop(key, None)
- if six.PY3:
- request.environ['QUERY_STRING'] = query.urlencode()
- else:
- request.environ['QUERY_STRING'] = query.urlencode().encode('utf-8')
+ request.environ['QUERY_STRING'] = query.urlencode()
 
  # Reconstruct GET QueryList in the same way WSGIRequest.GET function works
  request.GET = http.QueryDict(request.environ['QUERY_STRING'])

djng/styling/bootstrap3/forms.py

@@ -1,4 +1,3 @@
-from six import with_metaclass
 import warnings
 
 from django import VERSION as DJANGO_VERSION
@@ -34,14 +33,14 @@ def as_div(self):
  return div_element
 
 
-class Bootstrap3Form(with_metaclass(NgDeclarativeFieldsMetaclass, Bootstrap3FormMixin, NgFormBaseMixin, BaseForm)):
+class Bootstrap3Form(Bootstrap3FormMixin, NgFormBaseMixin, BaseForm, metaclass=NgDeclarativeFieldsMetaclass):
  """
  Convenience class to be used instead of Django's internal ``forms.Form`` when declaring
  a form to be used with AngularJS and Bootstrap3 styling.
  """
 
 
-class Bootstrap3ModelForm(with_metaclass(NgModelFormMetaclass, Bootstrap3FormMixin, NgFormBaseMixin, BaseModelForm)):
+class Bootstrap3ModelForm(Bootstrap3FormMixin, NgFormBaseMixin, BaseModelForm, metaclass=NgModelFormMetaclass):
  """
  Convenience class to be used instead of Django's internal ``forms.ModelForm`` when declaring
  a model form to be used with AngularJS and Bootstrap3 styling.