Merge branch 'releases/2.3'

Author: jrief

.travis.yml

@@ -6,36 +6,24 @@ services:
 language: python
 
 python:
- - 2.7
  - 3.6
  - 3.7
+ - 3.8
 
 env:
- - DJANGOVER=django110
- - DJANGOVER=django111
- - DJANGOVER=django20
  - DJANGOVER=django21
  - DJANGOVER=django22
+ - DJANGOVER=django30
 
 install:
  - pip install tox
 
 matrix:
  exclude:
- - python: 2.7
- env: DJANGOVER=django20
- - python: 2.7
+ - python: 3.8
  env: DJANGOVER=django21
- - python: 2.7
+ - python: 3.8
  env: DJANGOVER=django22
- - python: 3.6
- env: DJANGOVER=django110
- - python: 3.7
- env: DJANGOVER=django110
- - python: 3.7
- env: DJANGOVER=django111
- - python: 3.7
- env: DJANGOVER=django20
 
 before_script:
  - export CHROME_BIN=chromium-browser

AUTHORS.md

@@ -37,6 +37,7 @@ Contributors are listed in alphabetical order by GitHub login.
 * [Thomas Fillon (thomasfillon)](https://github.com/thomasfillon) — [1+](https://github.com/jrief/django-angular/commits?author=thomasfillon)/[1+](https://github.com/jrief/django-angular/issues?q=author%3Athomasfillon)
 * [Tino de Bruijn (tino)](https://github.com/tino) — [1+](https://github.com/jrief/django-angular/commits?author=tino)/[1+](https://github.com/jrief/django-angular/issues?q=author%3Atino)
 * [Ulrich Wagner (viaregio)](https://github.com/viaregio) — [3+](https://github.com/jrief/django-angular/commits?author=viaregio)/[2+](https://github.com/jrief/django-angular/issues?q=author%3Aviaregio)
+* [Oshosanya Michael (oshosanya)](https://github.com/oshosanya)
 
 Numbers link to commits/issues.
 For simplicity, this file is maintained only in English.

djng/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 """
 See PEP 386 (https://www.python.org/dev/peps/pep-0386/)
 
@@ -20,6 +18,6 @@
 13. git push
 """
 
-__version__ = '2.2.4'
+__version__ = '2.3'
 
 default_app_config = 'djng.app_config.DjangoAngularConfig'

djng/app_config.py

@@ -1,21 +1,15 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 
 
 class DjangoAngularConfig(AppConfig):
  name = 'djng'
 
  def ready(self):
- from django import VERSION
  from django.forms.widgets import RadioSelect
 
  def id_for_label(self, id_, index=None):
  if id_ and index and self.add_id_index:
  id_ = '%s_%s' % (id_, index)
  return id_
 
- if VERSION >= (1, 11):
- RadioSelect.id_for_label = id_for_label
-
+ RadioSelect.id_for_label = id_for_label

djng/app_settings.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-
 class AppSettings(object):
  def _setting(self, name, default=None):
  from django.conf import settings

djng/core/urlresolvers.py

@@ -1,8 +1,5 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 from inspect import isclass
 
-from django.utils import six
 from django.urls import (get_resolver, get_urlconf, resolve, reverse, NoReverseMatch)
 from django.core.exceptions import ImproperlyConfigured
 
@@ -38,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
-from django.utils 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

@@ -1,26 +1,12 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import json
 from base64 import b64encode
-
-try:
- from collections import UserList
-except ImportError: # Python 2
- from UserList import UserList
-
+from collections import UserList
+import json
 import warnings
 
-from django import VERSION as DJANGO_VERSION
 from django.forms import forms
 from django.http import QueryDict
-from django.utils import six
-try:
- from importlib import import_module
-except ImportError:
- from django.utils.importlib import import_module
 from django.utils.html import format_html, format_html_join, escape, conditional_escape
-from django.utils.encoding import python_2_unicode_compatible, force_text
+from django.utils.encoding import force_text
 from django.utils.module_loading import import_string
 from django.utils.safestring import mark_safe, SafeText, SafeData
 from django.core.exceptions import ValidationError, ImproperlyConfigured
@@ -35,7 +21,6 @@ class SafeTuple(SafeData, tuple):
  """
 
 
-@python_2_unicode_compatible
 class TupleErrorList(UserList, list):
  """
  A list of errors, which in contrast to Django's ErrorList, can contain a tuple for each item.
@@ -209,12 +194,11 @@ def as_widget(self, widget=None, attrs=None, only_initial=False):
  if not widget:
  widget = self.field.widget
 
- if DJANGO_VERSION > (1, 10):
- # so that we can refer to the field when building the rendering context
- widget._field = self.field
- # Make sure that NgWidgetMixin is not already part of the widget's bases so it doesn't get added twice.
- if not isinstance(widget, NgWidgetMixin):
- widget.__class__ = type(widget.__class__.__name__, (NgWidgetMixin, widget.__class__), {})
+ # so that we can refer to the field when building the rendering context
+ widget._field = self.field
+ # Make sure that NgWidgetMixin is not already part of the widget's bases so it doesn't get added twice.
+ if not isinstance(widget, NgWidgetMixin):
+ widget.__class__ = type(widget.__class__.__name__, (NgWidgetMixin, widget.__class__), {})
  return super(NgBoundField, self).as_widget(widget, attrs, only_initial)
 
  def build_widget_attrs(self, attrs, widget=None):
@@ -297,15 +281,11 @@ 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)
- if DJANGO_VERSION < (1, 11):
- self.convert_widgets()
  super(NgFormBaseMixin, self).__init__(*args, **kwargs)
  if isinstance(self.data, QueryDict):
  self.data = self.rectify_multipart_form_data(self.data.copy())
@@ -364,19 +344,6 @@ def update_widget_attrs(self, bound_field, attrs):
  attrs.update({'class': widget_classes})
  return attrs
 
- def convert_widgets(self):
- """
- During form initialization, some widgets have to be replaced by a counterpart suitable to
- be rendered the AngularJS way.
- """
- warnings.warn("Will be removed after dropping support for Django-1.10", PendingDeprecationWarning)
- widgets_module = getattr(self, 'widgets_module', 'djng.widgets')
- for field in self.base_fields.values():
- if hasattr(field, 'get_converted_widget'):
- new_widget = field.get_converted_widget(widgets_module)
- if new_widget:
- field.widget = new_widget
-
  def rectify_multipart_form_data(self, data):
  """
  If a widget was converted and the Form data was submitted through a multipart request,

djng/forms/angular_model.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.forms.utils import ErrorDict
 from django.utils.html import format_html
 from djng.forms.angular_base import NgFormBaseMixin, SafeTuple

djng/forms/angular_validation.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 from django.forms import widgets
 from django.utils.html import format_html
 from django.utils.encoding import force_text