interesting

Author: marqh

lib/bald/__init__.py

@@ -41,7 +41,7 @@ def __init__(self, attrs=None):
         if attrs is None:
             attrs = []
         self.attrs = attrs
-        self._prefix_suffix = re.compile('(^(?:(?!_._).)*)_._((?!.*_._).*$)')
+        self._prefix_suffix = re.compile('(^(?:(?!__).)*)__((?!.*__).*$)')
         _http_p = 'http[s]?://.*'
         self._http_uri = re.compile('{}'.format(_http_p))
         self._http_uri_prefix = re.compile('{}/|#'.format(_http_p))
@@ -50,8 +50,8 @@ def __init__(self, attrs=None):
     def prefixes(self):
         prefixes = {}
         for key, value in self.attrs.iteritems():
-            if key.endswith('_._') and self._http_uri_prefix.match(value):
-                pref = key.rstrip('_._')
+            if key.endswith('__') and self._http_uri_prefix.match(value):
+                pref = key.rstrip('__')
                 if prefixes.has_key(pref):
                     raise ValueError('This container has conflicting prefix definitions')
                 prefixes[pref] = value
@@ -65,7 +65,7 @@ def unpack_uri(self, astring):
 
             if self.prefixes().has_key(prefix):
                 if self._http_uri.match(self.prefixes()[prefix]):
-                    result = astring.replace('{}_._'.format(prefix), self.prefixes()[prefix])
+                    result = astring.replace('{}__'.format(prefix), self.prefixes()[prefix])
         return result
 
 @contextlib.contextmanager

lib/bald/tests/integration/test_validation.py

@@ -7,16 +7,19 @@
 from bald.tests import BaldTestCase
 
 def _fattrs(f):
-    f.attrs['bald_._'] = 'http://binary-array-ld.net/experimental/'
-    f.attrs['bald_._type'] = 'bald_._Container'
+    f.attrs['bald__'] = 'http://binary-array-ld.net/experimental/'
+    f.attrs['rdf__'] = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
+    f.attrs['rdf__type'] = 'bald__Container'
     return f
 
 def _create_parent_child(f, pshape, cshape):
     dsetp = f.create_dataset("parent_dataset", pshape, dtype='i')
     dsetc = f.create_dataset("child_dataset", cshape, dtype='i')
-    dsetp.attrs['bald_._type'] = 'bald_._Dataset'
-    dsetp.attrs['bald_._reference'] = dsetc.ref
-    dsetc.attrs['bald_._type'] = 'bald_._Dataset'
+    dsetp.attrs['rdf__type'] = 'bald__Dataset'
+    dsetp.attrs['bald__references'] = dsetc.ref
+    dsetc.attrs['rdf__type'] = 'bald__Dataset'
+    dsetc.attrs['rdf__type'] = 'bald__Reference'
+    dsetc.attrs['bald__dataset'] = dsetc.ref
     return f
 
 
@@ -35,7 +38,7 @@ def test_invalid_uri(self):
             f = h5py.File(tfile, "w")
             f = _fattrs(f)
             f = _create_parent_child(f, (11, 17), (11, 17))
-            f.attrs['bald_._turtle'] = 'bald_._walnut'
+            f.attrs['bald__turtle'] = 'bald__walnut'
             f.close()
             self.assertFalse(bald.validate_hdf5(tfile))
 

lib/bald/tests/test_array_reference.py

@@ -6,16 +6,16 @@
 from bald.tests import BaldTestCase
 
 def _fattrs(f):
-    f.attrs['bald_._'] = 'http://binary_array_ld.net/experimental'
-    f.attrs['bald_._type'] = 'bald_._Container'
+    f.attrs['bald__'] = 'http://binary_array_ld.net/experimental'
+    f.attrs['bald__type'] = 'bald__Container'
     return f
 
 def _create_parent_child(f, pshape, cshape):
     dsetp = f.create_dataset("parent_dataset", pshape, dtype='i')
     dsetc = f.create_dataset("child_dataset", cshape, dtype='i')
-    dsetp.attrs['bald_._type'] = 'bald_._Dataset'
-    dsetp.attrs['bald_._reference'] = dsetc.ref
-    dsetc.attrs['bald_._type'] = 'bald_._Dataset'
+    dsetp.attrs['bald__type'] = 'bald__Dataset'
+    dsetp.attrs['bald__reference'] = dsetc.ref
+    dsetc.attrs['bald__type'] = 'bald__Dataset'
     return f
 
 

lib/bald/tests/test_simple.py

@@ -22,14 +22,14 @@ def test_make_load_file(self):
         with self.temp_filename('.hdf') as tfile:
             f = h5py.File(tfile, "w")
             dset = f.create_dataset("mydataset", (100,), dtype='i')
-            dset.attrs['bald_._'] = 'http://binary_array_ld.net/alpha'
+            dset.attrs['bald__'] = 'http://binary_array_ld.net/experimental'
             f.close()
             newf = h5py.File(tfile, "r")
             nset = newf.get('mydataset')
             self.assertEqual(nset.shape, (100,))
             self.assertEqual(nset.dtype, 'int32')
-            self.assertEqual(nset.attrs.get('bald_._'),
-                             'http://binary_array_ld.net/alpha')
+            self.assertEqual(nset.attrs.get('bald__'),
+                             'http://binary_array_ld.net/experimental')
 
 
 if __name__ == '__main__':

lib/bald/validation.py

@@ -156,7 +156,7 @@ def _check_ref(pdataset, parray, cdataset, carray):
 
         for attr, value in self.subject.attrs.iteritems():
             # should support subtypes
-            if attr == 'bald_._reference':
+            if attr == 'bald__references':
                 # check if it's this type, otherwise exception)
                 # if isinstance(value,
                 child_dset = self.fhandle[value]