Merge pull request #1412 from scieloorg/beta

Incoporação de códigos estáveis.
scieloorg · Apr 27, 2017 · f754225 · f754225
2 parents 088b712 + 918ab58
commit f754225
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -13,7 +13,7 @@ yuicompressor
 jsonfield
 django-tastypie==0.9.16
 django-htmlmin==0.7.0
-packtools==1.3.3
+packtools==2.0.1
 celery==3.1.25
 django-celery==3.1.16
 defusedxml==0.4.1

diff --git a/scielomanager/validator/utils.py b/scielomanager/validator/utils.py
@@ -45,10 +45,16 @@ def analyze_xml(file, extra_schematron=None):
     """Analyzes `file` against packtools' XMLValidator.
     """
     result = err = None
+    if extra_schematron:
+        extra_sch = packtools.utils.get_schematron_from_filepath(
+                extra_schematron)
+        extra_sch = [extra_sch]
+    else:
+        extra_sch = None
 
     try:
         xml = packtools.XMLValidator.parse(file,
-                extra_schematron=extra_schematron)
+                extra_sch_schemas=extra_sch)
 
     except (lxml.etree.XMLSyntaxError, IOError, ValueError,
             packtools.exceptions.XMLDoctypeError) as e: