setlr 0.2.10__tar.gz → 0.2.12__tar.gz

Users/jimmccusker/opt/ipython/bin/setlr

@@ -1,10 +1,10 @@
 #!/Users/jimmccusker/opt/ipython/bin/python
-# EASY-INSTALL-ENTRY-SCRIPT: 'setlr==0.2.10','console_scripts','setlr'
-__requires__ = 'setlr==0.2.10'
+# EASY-INSTALL-ENTRY-SCRIPT: 'setlr==0.2.12','console_scripts','setlr'
+__requires__ = 'setlr==0.2.12'
 import sys
 from pkg_resources import load_entry_point
 
 if __name__ == '__main__':
     sys.exit(
-        load_entry_point('setlr==0.2.10', 'console_scripts', 'setlr')()
+        load_entry_point('setlr==0.2.12', 'console_scripts', 'setlr')()
     )

Users/jimmccusker/opt/ipython/lib/python2.7/site-packages/setlr/__init__.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from builtins import str
+from builtins import next
+from builtins import object
 from rdflib import *
 from rdflib.util import guess_format
 import rdflib
@@ -11,7 +14,7 @@ import requests
 import pandas
 import re
 import os
-from six import text_type as unicode
+from six import text_type as str
 
 from jinja2 import Template
 from toposort import toposort_flatten
@@ -19,7 +22,7 @@ from numpy import isnan
 import uuid
 import tempfile
 import ijson
-from . import iterparse_filter
+import iterparse_filter
 #import xml.etree.ElementTree as ET
 import xml.etree.ElementTree
 
@@ -174,7 +177,7 @@ class FileLikeFromIter(object):
 
     def read(self, n=None):
         if n is None:
-            return self.data + ''.join(l for l in self.iter)
+            return self.data + b''.join(l for l in self.iter)
         else:
             while len(self.data) < n:
                 try:
@@ -240,7 +243,8 @@ def read_excel(location, result):
     )
     if result.value(csvw.header):
         args['header'] = [result.value(csvw.header).value]
-    df = pandas.read_excel(get_content(location, result),encoding='utf-8', **args)
+    with get_content(location, result) as f:
+        df = pandas.read_excel(f,encoding='utf-8', **args)
     return df
 
 def read_xml(location, result):
@@ -253,8 +257,9 @@ def read_xml(location, result):
         f.iter_end("/*")
     for xp in result[setl.xpath]:
         f.iter_end(xp.value)
-    for (i, (event, ele)) in enumerate(f.iterparse(get_content(location, result))):
-        yield i, ele
+    with get_content(location, result) as fo:
+        for (i, (event, ele)) in enumerate(f.iterparse(fo)):
+            yield i, ele
 
              
 def read_json(location, result):
@@ -263,7 +268,8 @@ def read_json(location, result):
         selector = selector.value
     else:
         selector = ""
-    return enumerate(ijson.items(get_content(location, result), selector))
+    with get_content(location, result) as fo:
+        return enumerate(ijson.items(fo, selector))
             
 
 extractors = {
@@ -458,7 +464,7 @@ def process_row(row, template, rowname, table, resources, transform, variables):
         if isinstance(value, dict):
             if '@if' in value:
                 try:
-                    fn = get_function(value['@if'], env.keys())
+                    fn = get_function(value['@if'], list(env.keys()))
                     incl = fn(**env)
                     if incl is None or not incl:
                         continue
@@ -471,12 +477,12 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                 except Exception as e:
                     trace = sys.exc_info()[2]
                     logger.error("Error in conditional %s\nRelevant Environment:", value['@if'])
-                    for key, v in env.items():
+                    for key, v in list(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)
+                    raise e
             if '@for' in value:
                 f = value['@for']
                 if isinstance(f, list):
@@ -489,7 +495,7 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                 else:
                     del val['@for']
                 try:
-                    fn = get_function(expression, env.keys())
+                    fn = get_function(expression, list(env.keys()))
                     values = fn(**env)
                     if values is not None:
                         for v in values:
@@ -505,8 +511,8 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                 except Exception as e:
                     trace = sys.exc_info()[2]
                     logger.error("Error in @for: %s", value['@for'])
-                    logger.error("Locals: %s", env.keys())
-                    raise(e, None, trace)
+                    logger.error("Locals: %s", list(env.keys()))
+                    raise e
                 continue
             if '@with' in value:
                 f = value['@with']
@@ -520,7 +526,7 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                 else:
                     del val['@with']
                 try:
-                    fn = get_function(expression, env.keys())
+                    fn = get_function(expression, list(env.keys()))
                     v = fn(**env)
                     if v is not None:
                         if len(variable_list) == 1:
@@ -535,11 +541,11 @@ def process_row(row, template, rowname, table, resources, transform, variables):
                 except Exception as e:
                     trace = sys.exc_info()[2]
                     logger.error("Error in with: %s", value['@with'])
-                    logger.error("Locals: %s", env.keys())
-                    raise(e, None, trace)
+                    logger.error("Locals: %s", list(env.keys()))
+                    raise e
                 continue
             this = {}
-            for child in value.items():
+            for child in list(value.items()):
                 if child[0] == '@if':
                     continue
                 if child[0] == '@for':
@@ -549,20 +555,20 @@ def process_row(row, template, rowname, table, resources, transform, variables):
             this = []
             for child in value:
                 todo.append((child, this, env))
-        elif isinstance(value, unicode):
+        elif isinstance(value, str):
             try:
-                template = get_template(unicode(value))
+                template = get_template(str(value))
                 this = template.render(**env)
             except Exception as e:
                 trace = sys.exc_info()[2]
                 logger.error("Error in template %s %s", value, type(value))
                 logger.error("Relevant Environment:")
-                for key, v in env.items():
+                for key, v in list(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)
+                raise e
         else:
             this = value
 
@@ -607,7 +613,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
     context = transform.value(setl.hasContext)
     if context is not None:
         context = json.loads(context.value)
@@ -648,7 +654,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
                 
     resources[generated.identifier] = result
 

Users/jimmccusker/opt/ipython/lib/python2.7/site-packages/setlr/iterparse_filter.py

@@ -3,8 +3,13 @@
 For details see:
 http://dalkescientific.com/writings/diary/archive/2006/11/06/iterparse_filter.html
 """
+from __future__ import print_function
 # I have got to rearrange my site to use shorter URLs.
 
+from future import standard_library
+standard_library.install_aliases()
+from builtins import zip
+from builtins import object
 __version__ = "0.9-experimental"
 
 import re
@@ -543,7 +548,7 @@ def test_syntax():
                                  (xpath, tag_list, got, bool(expect)))
 
 def test_filtering():
-    import cStringIO as StringIO
+    import io as StringIO
     f = StringIO.StringIO("""\
  <A><AA>
    <B xmlns="http://z/"><C/><spam:D xmlns:spam="http://spam/">eggs</spam:D></B>

Users/jimmccusker/opt/ipython/lib/python2.7/site-packages/{setlr-0.2.10-py2.7.egg-info → setlr-0.2.12-py2.7.egg-info}/PKG-INFO

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

Users/jimmccusker/opt/ipython/lib/python2.7/site-packages/setlr-0.2.12-py2.7.egg-info/pbr.json

@@ -0,0 +1 @@
+{"is_release": false, "git_version": "0b4b76f"}

Users/jimmccusker/opt/ipython/lib/python2.7/site-packages/{setlr-0.2.10-py2.7.egg-info → setlr-0.2.12-py2.7.egg-info}/requires.txt

@@ -3,7 +3,7 @@ cython
 numpy
 rdflib
 rdflib-jsonld
-pandas
+pandas==0.22.0
 requests
 toposort
 beautifulsoup4

Users/jimmccusker/opt/ipython/lib/python2.7/site-packages/setlr-0.2.10-py2.7.egg-info/pbr.json

@@ -1 +0,0 @@
-{"is_release": false, "git_version": "a559233"}