prefer python3

Author: marqh

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 python:
-  - "2.7"
+  - "3.5"
 install:
   - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
   - bash Miniconda3-latest-Linux-x86_64.sh -b -p $HOME/miniconda

lib/bald/__init__.py

@@ -7,6 +7,7 @@
 import numpy as np
 import rdflib
 import requests
+import six
 
 import bald.validation as bv
 
@@ -214,7 +215,7 @@ def _network_js_close():
 
 
 def is_http_uri(item):
-    return isinstance(item, basestring) and (item.startswith('http://') or item.startswith('https://'))
+    return isinstance(item, six.string_types) and (item.startswith('http://') or item.startswith('https://'))
 
 
 class HttpCache(object):
@@ -225,7 +226,7 @@ def __init__(self):
         self.cache = {}
 
     def is_http_uri(self, item):
-        return isinstance(item, basestring) and (item.startswith('http://') or item.startswith('https://'))
+        return isinstance(item, six.string_types) and (item.startswith('http://') or item.startswith('https://'))
 
     def __getitem__(self, item):
 
@@ -291,7 +292,7 @@ def __setattr__(self, attr, value):
                     self.attrs[attr].add(value)
                 else:
                     self.attrs[attr] = set((self.attrs[attr], value))
-            elif isinstance(self.attrs[attr], basestring):
+            elif isinstance(self.attrs[attr], six.string_types):
                 self.attrs[attr] = set([self.attrs[attr]])
 
 
@@ -303,7 +304,7 @@ def __getattr__(self, attr):
 
     def prefixes(self):
         prefixes = {}
-        for key, value in self._prefixes.iteritems():
+        for key, value in self._prefixes.items():
             if key.endswith('__') and self._http_uri_prefix.match(value):
                 pref = key.rstrip('__')
                 if pref in prefixes:
@@ -319,13 +320,13 @@ def unpack_uri(self, astring):
 
         """
         result = astring
-        if isinstance(astring, basestring) and self._prefix_suffix.match(astring):
+        if isinstance(astring, six.string_types) and self._prefix_suffix.match(astring):
             prefix, suffix = self._prefix_suffix.match(astring).groups()
             if prefix in self.prefixes():
                 if self._http_uri.match(self.prefixes()[prefix]):
                     result = astring.replace('{}__'.format(prefix),
                                              self.prefixes()[prefix])
-        elif isinstance(astring, basestring) and astring in self.aliases:
+        elif isinstance(astring, six.string_types) and astring in self.aliases:
             result = self.aliases[astring]
         return result
 
@@ -356,7 +357,7 @@ def _graph_elem_attrs(self, remaining_attrs):
             else:
                 kstr = '{key}: '.format(key=attr)
             vals = remaining_attrs[attr]
-            if isinstance(vals, basestring):
+            if isinstance(vals, six.string_types):
                 if is_http_uri(self.unpack_uri(vals)):
                     vstr = self.link_template
                     vstr = vstr.format(url=self.unpack_uri(vals), key=vals)
@@ -376,6 +377,7 @@ def _graph_elem_attrs(self, remaining_attrs):
                         vstrlist.append(vstr)
                 if vstrlist == []:
                     vstrlist = ['|']
+                vstrlist.sort()
                 vstr = ', '.join(vstrlist)
 
             attrs.append("'{}'".format(kstr + vstr))
@@ -386,6 +388,7 @@ def _graph_elem_attrs(self, remaining_attrs):
         type_links = []
         for rdftype in self.rdf__type:
             type_links.append(atype.format(url=self.unpack_uri(rdftype), key=rdftype))
+        type_links.sort()
         avar = avar.format(var=self.identity, type=', '.join(type_links), attrs=attrs)
 
         return avar

lib/bald/tests/integration/test_cdl_rdfgraph.py

@@ -18,7 +18,7 @@ def test_array_reference(self):
             cdl_file = os.path.join(self.cdl_path, 'array_reference.cdl')
             subprocess.check_call(['ncgen', '-o', tfile, cdl_file])
             root_container = bald.load_netcdf(tfile)
-            ttl = root_container.rdfgraph().serialize(format='n3')
+            ttl = root_container.rdfgraph().serialize(format='n3').decode("utf-8")
             # with open(os.path.join(self.ttl_path, 'array_reference.ttl'), 'w') as sf:
             #     sf.write(ttl)
             with open(os.path.join(self.ttl_path, 'array_reference.ttl'), 'r') as sf:
@@ -30,7 +30,7 @@ def test_multi_array_reference(self):
             cdl_file = os.path.join(self.cdl_path, 'multi_array_reference.cdl')
             subprocess.check_call(['ncgen', '-o', tfile, cdl_file])
             root_container = bald.load_netcdf(tfile)
-            ttl = root_container.rdfgraph().serialize(format='n3')
+            ttl = root_container.rdfgraph().serialize(format='n3').decode("utf-8")
             # with open(os.path.join(self.ttl_path, 'multi_array_reference.ttl'), 'w') as sf:
             #     sf.write(ttl)
             with open(os.path.join(self.ttl_path, 'multi_array_reference.ttl'), 'r') as sf:

lib/bald/validation.py

@@ -1,5 +1,6 @@
 import numpy as np
 import rdflib
+import six
 
 import bald
 
@@ -86,25 +87,25 @@ def _check_uri(uri, exceptions):
                 exceptions.append(msg)
             return exceptions
 
-        for pref, uri in self.subject.prefixes().iteritems():
+        for pref, uri in self.subject.prefixes().items():
             exceptions = _check_uri(self.subject.unpack_uri(uri),
                                     exceptions)
-        for alias, uri in self.subject.aliases.iteritems():
+        for alias, uri in self.subject.aliases.items():
             exceptions = _check_uri(self.subject.unpack_uri(uri),
                                     exceptions)
-        for attr, value in self.subject.attrs.iteritems():
-            if isinstance(attr, basestring):
+        for attr, value in self.subject.attrs.items():
+            if isinstance(attr, six.string_types):
                 att = self.subject.unpack_uri(attr)
                 if self.cache.is_http_uri(att):
                     exceptions = _check_uri(att, exceptions)
-            if isinstance(value, basestring):
+            if isinstance(value, six.string_types):
                 val = self.subject.unpack_uri(value)
                 if self.cache.is_http_uri(val):
                     exceptions = _check_uri(val, exceptions)
         return exceptions
 
     def check_attr_domain_range(self, exceptions):
-        for attr, value in self.subject.attrs.iteritems():
+        for attr, value in self.subject.attrs.items():
             uri = self.subject.unpack_uri(attr)
             if self.cache.is_http_uri(uri) and self.cache.check_uri(uri):
                 # thus we have a payload

requirements.txt

@@ -4,3 +4,4 @@ netCDF4
 requests
 rdflib
 jinja2
+six