From 4d3c6deddf5f9288c7d7b4ef1def8cf1df0ab2a5 Mon Sep 17 00:00:00 2001 From: Manvendra Singh Date: Thu, 18 May 2017 18:08:39 +0530 Subject: [PATCH] fix: use list of dict keys to iterate, fix flake8 warnings - py3 compatibility --- schema_salad/ref_resolver.py | 2 +- schema_salad/schema.py | 7 +++---- setup.py | 7 ++++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/schema_salad/ref_resolver.py b/schema_salad/ref_resolver.py index f7e2d1c2f..512d19216 100644 --- a/schema_salad/ref_resolver.py +++ b/schema_salad/ref_resolver.py @@ -685,7 +685,7 @@ def _resolve_identity(self, document, loader, base_url): def _normalize_fields(self, document, loader): # type: (Dict[Text, Text], Loader) -> None # Normalize fields which are prefixed or full URIn to vocabulary terms - for d in document: + for d in list(document.keys()): d2 = loader.expand_url(d, u"", scoped_id=False, vocab_term=True) if d != d2: document[d2] = document[d] diff --git a/schema_salad/schema.py b/schema_salad/schema.py index 5620d54b2..a2beb43ba 100644 --- a/schema_salad/schema.py +++ b/schema_salad/schema.py @@ -9,16 +9,15 @@ import avro.schema from . import validate import json -# import urlparse + from six.moves.urllib import parse import six import os -if six.PY3: +if six.PY3: AvroSchemaFromJSONData = avro.schema.SchemaFromJSONData -else: +else: AvroSchemaFromJSONData = avro.schema.make_avsc_object - from avro.schema import Names, SchemaParseException from . import ref_resolver diff --git a/setup.py b/setup.py index 48d79e9d1..a39bb7322 100755 --- a/setup.py +++ b/setup.py @@ -41,9 +41,10 @@ # install_requires.append("avro") # TODO: remove me once cwltool is # available in Debian Stable, Ubuntu 12.04 LTS -extras_require={ # TODO: uncomment me, same conditions as above - ':python_version<"3"': ['avro'], - ':python_version>="3"': ['avro-python3']} + +extras_require={ # TODO: uncomment me, same conditions as above + ':python_version<"3"': ['avro'], + ':python_version>="3"': ['avro-python3']} # extras_require = {} # TODO: to be removed when the above is added setup(name='schema-salad',