setlr 0.2.4__tar.gz → 0.2.5__tar.gz

Library/Python/2.7/site-packages/setlr/__init__.py

@@ -11,9 +11,10 @@ import requests
 import pandas
 import re
 import os
+from six import text_type as unicode
+
 from jinja2 import Template
 from toposort import toposort_flatten
-from StringIO import StringIO
 from numpy import isnan
 import uuid
 import tempfile
@@ -166,7 +167,7 @@ def read_graph(location, result, g = None):
 class FileLikeFromIter(object):
     def __init__(self, content_iter):
         self.iter = content_iter
-        self.data = ''
+        self.data = b''
 
     def __iter__(self):
         return self.iter
@@ -177,7 +178,7 @@ class FileLikeFromIter(object):
         else:
             while len(self.data) < n:
                 try:
-                    self.data = ''.join((self.data, self.iter.next()))
+                    self.data = b''.join((self.data, next(self.iter)))
                 except StopIteration:
                     break
             result, self.data = self.data[:n], self.data[n:]
@@ -471,11 +472,11 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                     trace = sys.exc_info()[2]
                     logger.error("Error in conditional %s\nRelevant Environment:", value['@if'])
                     for key, v in env.items():
-                        if key in value['@if']:
-                            if hasattr(v, 'findall'):
-                                 v = xml.etree.ElementTree.tostring(v)
-                            logger.error(key + "\t" + str(v)[:1000])
-                    raise e, None, trace
+                        #if key in value['@if']:
+                        if hasattr(v, 'findall'):
+                            v = xml.etree.ElementTree.tostring(v)
+                        logger.error(key + "\t" + str(v)[:1000])
+                    raise(e, None, trace)
             if '@for' in value:
                 f = value['@for']
                 if isinstance(f, list):
@@ -505,7 +506,7 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                     trace = sys.exc_info()[2]
                     logger.error("Error in @for: %s", value['@for'])
                     logger.error("Locals: %s", env.keys())
-                    raise e, None, trace
+                    raise(e, None, trace)
                 continue
             if '@with' in value:
                 f = value['@with']
@@ -535,7 +536,7 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                     trace = sys.exc_info()[2]
                     logger.error("Error in with: %s", value['@with'])
                     logger.error("Locals: %s", env.keys())
-                    raise e, None, trace
+                    raise(e, None, trace)
                 continue
             this = {}
             for child in value.items():
@@ -557,11 +558,11 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                 logger.error("Error in template %s %s", value, type(value))
                 logger.error("Relevant Environment:")
                 for key, v in env.items():
-                    if key in value:
-                        if hasattr(v, 'findall'):
-                            v = xml.etree.ElementTree.tostring(v)
-                        logger.error(key + "\t" + str(v)[:1000])
-                raise e, None, trace
+                    #if key in value:
+                    if hasattr(v, 'findall'):
+                        v = xml.etree.ElementTree.tostring(v)
+                    logger.error(key + "\t" + str(v)[:1000])
+                raise(e, None, trace)
         else:
             this = value
 
@@ -590,9 +591,9 @@ def json_transform(transform, resources):
     else:
         result = ConjunctiveGraph()
         if generated[RDF.type : setl.Persisted]:
-            result = ConjunctiveGraph(store="Sleepycat")
+            result = ConjunctiveGraph(store="FastTable")
         if generated[RDF.type : setl.Persisted]:
-            tempdir = tempfile.mkdtemp()
+            _, tempdir = tempfile.mkstemp()
             logger.info("Persisting %s to %s", generated.identifier, tempdir)
             result.store.open(tempdir, True)
     s = transform.value(prov.value).value
@@ -606,7 +607,7 @@ def json_transform(transform, resources):
             line = int(re.search("line ([0-9]+)", e.message).group(1))
             logger.error("Error in parsing JSON Template at line %d:", line)
             logger.error('\n'.join(["%d: %s"%(i+line-3, x) for i, x in enumerate(s.split("\n")[line-3:line+4])]))
-        raise e, None, trace
+        raise(e, None, trace)
     context = transform.value(setl.hasContext)
     if context is not None:
         context = json.loads(context.value)
@@ -647,7 +648,7 @@ def json_transform(transform, resources):
                     logger.error("Error on %s %s", rowname, row)
                 else:
                     logger.error("Error on %s", rowname)
-                raise e, None, trace
+                raise(e, None, trace)
                 
     resources[generated.identifier] = result
 
@@ -706,8 +707,8 @@ def load(load_resource, resources):
     for used in load_resource[prov.used]:
         if used[RDF.type : setl.Persisted]:
             to_disk = True
-            file_graph = Dataset(store='Sleepycat', default_union=True)
-            tempdir = tempfile.mkdtemp()
+            file_graph = Dataset(store='FastTable', default_union=True)
+            _, tempdir = tempfile.mkstemp()
             logger.debug("Gathering %s into %s", load_resource.identifier, tempdir)
             file_graph.store.open(tempdir, True)
             break

Library/Python/2.7/site-packages/setlr/iterparse_filter.py

@@ -436,14 +436,14 @@ class FilterAutomata(object):
                 for handler in self.start_ns_handlers:
                     handler(event, ele, state)
                 if self.iter_start_ns:
-                    print 'start-ns'
+                    print('start-ns')
                     yield (event, ele)
                 
             elif event == "end-ns":
                 for handler in self.end_ns_handlers:
                     handler(event, ele, state)
                 if self.iter_start_ns:
-                    print 'end-ns'
+                    print('end-ns')
                     yield (event, ele)
                     # It's safe to call clear() here because no descendants will be
                     # accessed
@@ -621,7 +621,7 @@ def test_parse():
     import os
     filename = "/Users/dalke/Music/iTunes/iTunes Music Library.xml"
     if not os.path.exists(filename):
-        print "Cannot find %r: skipping test" % (filename,)
+        print ("Cannot find %r: skipping test" % (filename,))
         return
 
     # Work through callbacks
@@ -633,7 +633,7 @@ def test_parse():
             key = child.text
             value = children.next().text
             d[key] = value
-        print "%r is by %r" % (d["Name"], d.get("Artist", "<unknown>"))
+        print ("%r is by %r" % (d["Name"], d.get("Artist", "<unknown>")))
         ele.clear()
             
     ef.on_end("/plist/dict/dict/dict", print_info)
@@ -649,7 +649,7 @@ def test_parse():
             key = child.text
             value = children.next().text
             d[key] = value
-        print "%r is a %r song" % (d["Name"], d.get("Genre", "<unknown>"))
+        print ("%r is a %r song" % (d["Name"], d.get("Genre", "<unknown>")))
         ele.clear()
             
 
@@ -660,4 +660,4 @@ def test():
 
 if __name__ == "__main__":
     test()
-    print "All tests passed."
+    print ("All tests passed.")

Library/Python/2.7/site-packages/{setlr-0.2.4-py2.7.egg-info → setlr-0.2.5-py2.7.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: setlr
-Version: 0.2.4
+Version: 0.2.5
 Summary: setlr is a tool for Semantic Extraction, Transformation, and Loading.
 Home-page: http://packages.python.org/setlr
 Author: Jim McCusker

Library/Python/2.7/site-packages/{setlr-0.2.4-py2.7.egg-info → setlr-0.2.5-py2.7.egg-info}/SOURCES.txt

@@ -1,3 +1,4 @@
+README.md
 setup.cfg
 setup.py
 setlr/__init__.py

Library/Python/2.7/site-packages/{setlr-0.2.4-py2.7.egg-info → setlr-0.2.5-py2.7.egg-info}/requires.txt

@@ -9,6 +9,7 @@ toposort
 beautifulsoup4
 jinja2
 lxml
+six
 xlrd
 ijson
 requests-testadapter

usr/local/bin/setlr

@@ -1,10 +1,10 @@
 #!/usr/bin/python
-# EASY-INSTALL-ENTRY-SCRIPT: 'setlr==0.2.4','console_scripts','setlr'
-__requires__ = 'setlr==0.2.4'
+# EASY-INSTALL-ENTRY-SCRIPT: 'setlr==0.2.5','console_scripts','setlr'
+__requires__ = 'setlr==0.2.5'
 import sys
 from pkg_resources import load_entry_point
 
 if __name__ == '__main__':
     sys.exit(
-        load_entry_point('setlr==0.2.4', 'console_scripts', 'setlr')()
+        load_entry_point('setlr==0.2.5', 'console_scripts', 'setlr')()
     )