Initial 2to3 patch with added copyright statement updates.

 - Legacy-Id: 16309

Author: levkowetz

ietf/__init__.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import checks                           # pyflakes:ignore
+from . import checks                           # pyflakes:ignore
 
 # Don't add patch number here:
 __version__ = "6.98.2.dev0"

ietf/api/__init__.py

@@ -1,7 +1,8 @@
+# Copyright The IETF Trust 2014-2019, All Rights Reserved
 import re
 import six
 import datetime
-from urllib import urlencode
+from urllib.parse import urlencode
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -129,9 +130,9 @@ def dehydrate(self, bundle, for_list=True):
         if not foreign_obj:
             if not self.null:
                 if callable(self.attribute):
-                    raise ApiFieldError(u"The related resource for resource %s could not be found." % (previous_obj))
+                    raise ApiFieldError("The related resource for resource %s could not be found." % (previous_obj))
                 else:
-                    raise ApiFieldError(u"The model '%r' has an empty attribute '%s' and doesn't allow a null value." % (previous_obj, attr))
+                    raise ApiFieldError("The model '%r' has an empty attribute '%s' and doesn't allow a null value." % (previous_obj, attr))
             return None
 
         fk_resource = self.get_related_resource(foreign_obj)

ietf/api/management/commands/makeresources.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import print_function
+
 
 import os
 import datetime
@@ -66,7 +66,7 @@ def handle_app_config(self, app, **options):
             app_resources = {}
             if os.path.exists(resource_file_path):
                 resources = import_module("%s.resources" % app.name)
-                for n,v in resources.__dict__.items():
+                for n,v in list(resources.__dict__.items()):
                     if issubclass(type(v), type(ModelResource)):
                         app_resources[n] = v
 
@@ -164,7 +164,7 @@ def handle_app_config(self, app, **options):
                             fields=model._meta.fields,
                             m2m_fields=model._meta.many_to_many,
                             name=model_name,
-                            imports=[ v for k,v in imports.items() ],
+                            imports=[ v for k,v in list(imports.items()) ],
                             foreign_keys=foreign_keys,
                             m2m_keys=m2m_keys,
                             resource_name=resource_name,
@@ -184,7 +184,7 @@ def handle_app_config(self, app, **options):
                     while len(new_models) > 0:
                         list_len = len(new_models)
                         #debug.show('len(new_models)')
-                        keys = new_models.keys()
+                        keys = list(new_models.keys())
                         for model_name in keys:
                             internal_fk_count = 0
                             for fk in new_models[model_name]["foreign_keys"]+new_models[model_name]["m2m_keys"]:
@@ -207,7 +207,7 @@ def handle_app_config(self, app, **options):
                                 internal_fk_count_limit += 1
                             else:
                                 print("Failed also with partial ordering, writing resource classes without ordering")
-                                new_model_list = [ v for k,v in new_models.items() ]
+                                new_model_list = [ v for k,v in list(new_models.items()) ]
                                 break
 
                     if rfile.tell() == 0:

ietf/api/serializer.py

@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2018-2019, All Rights Reserved
 import hashlib
 import json
 
@@ -16,7 +17,7 @@
 def filter_from_queryargs(request):
     #@debug.trace
     def fix_ranges(d):
-        for k,v in d.items():
+        for k,v in list(d.items()):
             if v.startswith("[") and v.endswith("]"):
                 d[k] = [ s for s in v[1:-1].split(",") if s ]
             elif "," in v:
@@ -27,9 +28,9 @@ def fix_ranges(d):
     def is_ascii(s):
         return all(ord(c) < 128 for c in s)
     # limit parameter keys to ascii.
-    params = dict( (k,v) for (k,v) in request.GET.items() if is_ascii(k) )
-    filter = fix_ranges(dict([(k,params[k]) for k in params.keys() if not k.startswith("not__")]))
-    exclude = fix_ranges(dict([(k[5:],params[k]) for k in params.keys() if k.startswith("not__")]))
+    params = dict( (k,v) for (k,v) in list(request.GET.items()) if is_ascii(k) )
+    filter = fix_ranges(dict([(k,params[k]) for k in list(params.keys()) if not k.startswith("not__")]))
+    exclude = fix_ranges(dict([(k[5:],params[k]) for k in list(params.keys()) if k.startswith("not__")]))
     return filter, exclude
 
 def unique_obj_name(obj):
@@ -147,7 +148,7 @@ def end_object(self, obj):
                             if hasattr(field_value, "_meta"):
                                 self._current[name] = self.expand_related(field_value, name)
                             else:
-                                self._current[name] = unicode(field_value)
+                                self._current[name] = str(field_value)
             except ObjectDoesNotExist:
                 pass
             except AttributeError:
@@ -224,7 +225,7 @@ class JsonExportMixin(object):
 
     def json_view(self, request, filter={}, expand=[]):
         qfilter, exclude = filter_from_queryargs(request)
-        for k in qfilter.keys():
+        for k in list(qfilter.keys()):
             if k.startswith("_"):
                 del qfilter[k]
         qfilter.update(filter)
@@ -244,15 +245,15 @@ def json_view(self, request, filter={}, expand=[]):
         try:
             qs = self.get_queryset().filter(**filter).exclude(**exclude)
         except (FieldError, ValueError) as e:
-            return HttpResponse(json.dumps({u"error": str(e)}, sort_keys=True, indent=3), content_type=content_type)
+            return HttpResponse(json.dumps({"error": str(e)}, sort_keys=True, indent=3), content_type=content_type)
         try:
             if expand:
                 qs = qs.select_related()
             serializer = AdminJsonSerializer()
             items = [(getattr(o, key), serializer.serialize([o], expand=expand, query_info=query_info) )  for o in qs ]
             qd = dict( ( k, json.loads(v)[0] )  for k,v in items )
         except (FieldError, ValueError) as e:
-            return HttpResponse(json.dumps({u"error": str(e)}, sort_keys=True, indent=3), content_type=content_type)
+            return HttpResponse(json.dumps({"error": str(e)}, sort_keys=True, indent=3), content_type=content_type)
         text = json.dumps({smart_text(self.model._meta): qd}, sort_keys=True, indent=3)
         return HttpResponse(text, content_type=content_type)
 

ietf/api/tests.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2015-2018, All Rights Reserved
+# Copyright The IETF Trust 2015-2019, All Rights Reserved
 
 import json
 import os
@@ -218,8 +218,8 @@ def test_all_model_resources_exist(self):
             #
             model_list = apps.get_app_config(name).get_models()
             for model in model_list:
-                if not model._meta.model_name in app_resources.keys():
+                if not model._meta.model_name in list(app_resources.keys()):
                     #print("There doesn't seem to be any resource for model %s.models.%s"%(app.__name__,model.__name__,))
-                    self.assertIn(model._meta.model_name, app_resources.keys(),
+                    self.assertIn(model._meta.model_name, list(app_resources.keys()),
                         "There doesn't seem to be any API resource for model %s.models.%s"%(app.__name__,model.__name__,))
 

ietf/api/views.py

@@ -1,7 +1,7 @@
-# Copyright The IETF Trust 2017, All Rights Reserved
+# Copyright The IETF Trust 2017-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
+
 
 from jwcrypto.jwk import JWK
 

ietf/community/admin.py

@@ -1,24 +1,24 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 from django.contrib import admin
 
 from ietf.community.models import CommunityList, SearchRule, EmailSubscription
 
 class CommunityListAdmin(admin.ModelAdmin):
-    list_display = [u'id', 'user', 'group']
+    list_display = ['id', 'user', 'group']
     raw_id_fields = ['user', 'group', 'added_docs']
 admin.site.register(CommunityList, CommunityListAdmin)
 
 class SearchRuleAdmin(admin.ModelAdmin):
-    list_display = [u'id', 'community_list', 'rule_type', 'state', 'group', 'person', 'text']
+    list_display = ['id', 'community_list', 'rule_type', 'state', 'group', 'person', 'text']
     raw_id_fields = ['community_list', 'state', 'group', 'person', 'name_contains_index']
     search_fields = ['person__name', 'group__acronym', 'text', ]
 admin.site.register(SearchRule, SearchRuleAdmin)
 
 class EmailSubscriptionAdmin(admin.ModelAdmin):
-    list_display = [u'id', 'community_list', 'email', 'notify_on']
+    list_display = ['id', 'community_list', 'email', 'notify_on']
     raw_id_fields = ['community_list', 'email']
 admin.site.register(EmailSubscription, EmailSubscriptionAdmin)
 

ietf/community/forms.py

@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 from django import forms
 from django.db.models import Q
 
@@ -82,9 +83,9 @@ def restrict_state(state_type, slug=None):
 
         if 'group' in self.fields:
             self.fields['group'].queryset = self.fields['group'].queryset.filter(state="active").order_by("acronym")
-            self.fields['group'].choices = [(g.pk, u"%s - %s" % (g.acronym, g.name)) for g in self.fields['group'].queryset]
+            self.fields['group'].choices = [(g.pk, "%s - %s" % (g.acronym, g.name)) for g in self.fields['group'].queryset]
 
-        for name, f in self.fields.iteritems():
+        for name, f in self.fields.items():
             f.required = True
 
     def clean_text(self):

ietf/community/migrations/0001_initial.py

@@ -1,6 +1,7 @@
+# Copyright The IETF Trust 2018-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 import django.db.models.deletion

ietf/community/migrations/0002_auto_20180220_1052.py

@@ -1,6 +1,7 @@
+# Copyright The IETF Trust 2018-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
-from __future__ import unicode_literals
+
 
 from django.conf import settings
 from django.db import migrations, models