X-Git-Url: https://git.phdru.name/?p=extfs.d.git;a=blobdiff_plain;f=xml;h=59fad36688b17a60f937f9d4aa82441eaf53e70d;hp=0315590924c7e0356bdba72baed265ac8b06c514;hb=HEAD;hpb=f97e5336b4ad99795321448b852266f20ad0135f

diff --git a/xml b/xml
index 0315590..fe3b5b5 100755
--- a/xml
+++ b/xml
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """XML Virtual FileSystem for Midnight Commander
 
 The script requires Midnight Commander 3.1+
@@ -14,7 +14,7 @@ file the command is "%cd"): cd file/xml://; in older versions it is
 cd file#xml, where "file" is the name of your XML file.
 
 See detailed installation instructions at
-http://phdru.name/Software/mc/xml_INSTALL.html.
+https://phdru.name/Software/mc/xml_INSTALL.html.
 
 The VFS represents tags as directories; the directories are numbered to
 distinguish tags with the same name; numbering also helps to sort tags by their
@@ -43,10 +43,11 @@ its text file to a real file.
 The VFS was inspired by a FUSE xmlfs: https://github.com/halhen/xmlfs
 
 """
+from __future__ import print_function
 
-__version__ = "1.1.5"
+__version__ = "1.2.1"
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2013-2015 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2013-2023 PhiloSoft Design"
 __license__ = "GPL"
 
 # Can be None for default choice, 'lxml', 'elementtree' or 'minidom'.
@@ -62,13 +63,6 @@ import sys
 from time import localtime
 import xml.dom.minidom
 
-try:
-    import xml.etree.ElementTree as ET
-except ImportError:
-    pass
-else:
-    use_elementtree = True
-
 try:
     import lxml.etree as etree
 except ImportError:
@@ -85,9 +79,12 @@ except ImportError:
 if use_locale:
     # Get the default charset.
     try:
-        lcAll = locale.getdefaultlocale()
-    except locale.Error, err:
-        print >>sys.stderr, "WARNING:", err
+        if sys.version_info[:2] < (3, 11):
+            lcAll = locale.getdefaultlocale()
+        else:
+            lcAll = []
+    except locale.Error as err:
+        print("WARNING:", err, file=sys.stderr)
         lcAll = []
 
     if len(lcAll) == 2:
@@ -95,8 +92,8 @@ if use_locale:
     else:
         try:
             default_encoding = locale.getpreferredencoding()
-        except locale.Error, err:
-            print >>sys.stderr, "WARNING:", err
+        except locale.Error as err:
+            print("WARNING:", err, file=sys.stderr)
             default_encoding = sys.getdefaultencoding()
 else:
     default_encoding = sys.getdefaultencoding()
@@ -121,6 +118,21 @@ This is not a program. Put the script in $HOME/[.local/share/].mc/extfs.d or
 
 locale.setlocale(locale.LC_ALL, '')
 
+PY3 = (sys.version_info[0] >= 3)
+if PY3:
+    def output(s):
+        sys.stdout.buffer.write(s.encode(default_encoding, 'replace') + b'\n')
+else:
+    def output(s):
+        sys.stdout.write(s + '\n')
+
+    try:
+        import xml.etree.ElementTree as ET
+    except ImportError:
+        pass
+    else:
+        use_elementtree = True
+
 
 class XmlVfs(object):
     """Abstract base class"""
@@ -137,8 +149,8 @@ class XmlVfs(object):
 
         root_comments = self.get_root_comments()
         if root_comments:
-            print "-r--r--r-- 1 user group %d %s text" % (
-                len(root_comments), self.xml_file_dt)
+            output("-r--r--r-- 1 user group %d %s text" % (
+                len(root_comments), self.xml_file_dt))
 
         self._list(self.getroot())
 
@@ -159,21 +171,20 @@ class XmlVfs(object):
                 subpath = '%s/%s %s' % (path, template % n, tag)
             else:
                 subpath = '%s %s' % (template % n, tag)
-            subpath_encoded = subpath.encode(default_encoding, "replace")
-            print "dr-xr-xr-x 1 user group 0 %s %s" % (
-                self.xml_file_dt, subpath_encoded)
+            output("dr-xr-xr-x 1 user group 0 %s %s" % (
+                self.xml_file_dt, subpath))
             if self.getattrs(element):
                 attr_text = self.attrs2text(element)
-                print "-r--r--r-- 1 user group %d %s %s/attributes" % (
-                    len(attr_text), self.xml_file_dt, subpath_encoded)
+                output("-r--r--r-- 1 user group %d %s %s/attributes" % (
+                    len(attr_text), self.xml_file_dt, subpath))
             if self.supports_namespaces and self.has_ns(element):
                 ns_text = self.ns2text(element)
-                print "-r--r--r-- 1 user group %d %s %s/namespaces" % (
-                    len(ns_text), self.xml_file_dt, subpath_encoded)
+                output("-r--r--r-- 1 user group %d %s %s/namespaces" % (
+                    len(ns_text), self.xml_file_dt, subpath))
             text = self.collect_text(element)
             if text:
-                print "-r--r--r-- 1 user group %d %s %s/text" % (
-                    len(text), self.xml_file_dt, subpath_encoded)
+                output("-r--r--r-- 1 user group %d %s %s/text" % (
+                    len(text), self.xml_file_dt, subpath))
             self._list(element, subpath)
 
     def get_tag_node(self, node, i):
@@ -188,8 +199,7 @@ class XmlVfs(object):
     def attrs2text(self, node):
         attr_accumulator = []
         for name, value in self.getattrs(node):
-            name = self.getlocalname(name).encode(default_encoding, "replace")
-            value = value.encode(default_encoding, "replace")
+            name = self.getlocalname(name)
             attr_accumulator.append("%s=%s" % (name, value))
         return '\n'.join(attr_accumulator)
 
@@ -219,7 +229,7 @@ class MiniDOMXmlVfs(XmlVfs):
                 xml_error("Unknown node type %d" % element.nodeType)
             if text:
                 text_accumulator.append(text)
-        return '\n'.join(text_accumulator).encode(default_encoding, "replace")
+        return '\n'.join(text_accumulator)
 
     def getroot(self):
         return self.document
@@ -259,8 +269,7 @@ if use_elementtree or use_lxml:
                 text = node.tail.strip()
                 if text:
                     text_accumulator.append(text)
-            return '\n'.join(text_accumulator).encode(
-                default_encoding, "replace")
+            return '\n'.join(text_accumulator)
 
         def getchildren(self, node):
             return list(node)
@@ -311,8 +320,7 @@ if use_elementtree:
                 if not self.istag(element):
                     text = u"<!--%s-->" % element.text
                     text_accumulator.append(text)
-            return '\n'.join(text_accumulator).encode(
-                default_encoding, "replace")
+            return '\n'.join(text_accumulator)
 
         def getlocalname(self, name):
             if name.startswith('{'):
@@ -336,8 +344,7 @@ if use_lxml:
                     tag=etree.Comment, preceding=True):
                 text = u"<!--%s-->" % element.text
                 text_accumulator.append(text)
-            return '\n'.join(text_accumulator).encode(
-                default_encoding, "replace")
+            return '\n'.join(text_accumulator)
 
         def getlocalname(self, name):
             return etree.QName(name).localname
@@ -358,11 +365,8 @@ if use_lxml:
         def ns2text(self, node):
             ns_accumulator = []
             for name, value in self._get_local_ns(node).items():
-                if name:
-                    name = name.encode(default_encoding, "replace")
-                else:
+                if not name:
                     name = 'xmlns'
-                value = value.encode(default_encoding, "replace")
                 ns_accumulator.append("%s=%s" % (name, value))
             return '\n'.join(ns_accumulator)
 
@@ -471,5 +475,5 @@ try:
     g[procname]()
 except SystemExit:
     raise
-except:
+except Exception:
     logger.exception("Error during run")