Merge branch 'magento2-xml-fix' into 'develop'

Magento2 xml fix

See merge request !9

magento2-xml-lint/latest/xml-lint

@@ -17,7 +17,11 @@ def get_mappings(misc_file, base_dir):
     return mapping
 
 def get_xml_files(search_dir):
-    return check_output(['find', search_dir, '-name', '*.xml']).splitlines()
+    try:
+        return check_output(['find', search_dir, '-name', '*.xml']).splitlines()
+    except CalledProcessError:
+        print("WARNING: No XML files found")
+        return []
 
 def lint_only(file):
     try:
@@ -42,20 +46,20 @@ def search_file_for_xsd(file):
     return None
 
 def validate_file(file, mapping):
-    print "validating file {}".format(file)
+    print("validating file {}".format(file))
     xsd = search_file_for_xsd(file)
     if xsd is not None:
         if xsd in mapping:
             lint_with_xsd(file, mapping[xsd])
         else:
-            print 'WARNING: Unable to map XSD to path: {}'.format(xsd)
+            print('WARNING: Unable to map XSD to path: {}'.format(xsd))
     else:
-        print 'WARNING: Unable to find XSD for file: {}'.format(file)
+        print('WARNING: Unable to find XSD for file: {}'.format(file))
     lint_only(file)
 
 def main():
     if len(sys.argv) < 4:
-        print "Usage: xml-lint <misc.xml> <app_base_dir> <search_dir>"
+        print("Usage: xml-lint <misc.xml> <app_base_dir> <search_dir>")
         exit(1)
 
     misc_file = sys.argv[1]
@@ -63,19 +67,19 @@ def main():
     search_dir = os.path.abspath(sys.argv[3])
 
     if not os.path.isfile(misc_file):
-        print "{} is not a file".format(misc_file)
+        print("{} is not a file".format(misc_file))
         exit(1)
 
     mapping = get_mappings(misc_file, base_dir)
-    print "loaded {} XSD mapping(s)".format(len(mapping))
+    print("loaded {} XSD mapping(s)".format(len(mapping)))
 
     xml_files = get_xml_files(search_dir)
-    print "found {} XML file(s)".format(len(xml_files))
+    print("found {} XML file(s)".format(len(xml_files)))
 
-    print ""
+    print("")
     for file in xml_files:
         validate_file(file, mapping)
-        print ""
+        print("")
 
 if __name__ == '__main__':
     main()