From 8d79ee939cbbfd58174799b9fdcf0773baf17b3f Mon Sep 17 00:00:00 2001 From: Leonardo Ortega Date: Thu, 21 Feb 2019 17:25:54 -0500 Subject: [PATCH 1/2] FIX-ERROR: ImportError: cannot import name 'force_unicode' from 'django.utils.encoding' --- django_remote_forms/fields.py | 2 +- django_remote_forms/forms.py | 2 +- django_remote_forms/utils.py | 6 +++++- setup.py | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/django_remote_forms/fields.py b/django_remote_forms/fields.py index 4e0d33a..b51b5a3 100644 --- a/django_remote_forms/fields.py +++ b/django_remote_forms/fields.py @@ -40,7 +40,7 @@ def as_dict(self): try: remote_widget_class = getattr(widgets, remote_widget_class_name) remote_widget = remote_widget_class(self.field.widget, field_name=self.field_name) - except Exception, e: + except Exception as e: logger.warning('Error serializing %s: %s', remote_widget_class_name, str(e)) widget_dict = {} else: diff --git a/django_remote_forms/forms.py b/django_remote_forms/forms.py index 26b38fb..ee736dd 100644 --- a/django_remote_forms/forms.py +++ b/django_remote_forms/forms.py @@ -138,7 +138,7 @@ def as_dict(self): try: remote_field_class = getattr(fields, remote_field_class_name) remote_field = remote_field_class(field, form_initial_field_data, field_name=name) - except Exception, e: + except Exception as e: logger.warning('Error serializing field %s: %s', remote_field_class_name, str(e)) field_dict = {} else: diff --git a/django_remote_forms/utils.py b/django_remote_forms/utils.py index 0391fa0..065af7e 100644 --- a/django_remote_forms/utils.py +++ b/django_remote_forms/utils.py @@ -1,5 +1,9 @@ from django.utils.functional import Promise -from django.utils.encoding import force_unicode + +try: + from django.utils.encoding import force_unicode # Django in Python 2 +except ImportError: + from django.utils.encoding import force_text as force_unicode # Django in Python 3 def resolve_promise(o): diff --git a/setup.py b/setup.py index fa1d0e4..b2c77cd 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='django-remote-forms', - version='0.0.1', + version='0.0.2', description='A platform independent form serializer for Django.', author='WiserTogether Tech Team', author_email='tech@wisertogether.com', From 3d6227e6f9630a033f93cbeaeada5210ae7ffded Mon Sep 17 00:00:00 2001 From: Leonardo Ortega Date: Thu, 21 Feb 2019 18:06:46 -0500 Subject: [PATCH 2/2] [SIO-266] Include in the notification from Project to TCC the CP Codes summary and the "Oracle Code" --- django_remote_forms/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_remote_forms/__init__.py b/django_remote_forms/__init__.py index 5fe3591..c301c00 100644 --- a/django_remote_forms/__init__.py +++ b/django_remote_forms/__init__.py @@ -1,5 +1,5 @@ __author__ = 'Carlo Costino, Tareque Hossain' -__version__ = (0, 0, 1) +__version__ = (0, 0, 2) import logging