enebootools 2.2.2__tar.gz → 2.3.1__tar.gz

{enebootools-2.2.2/enebootools.egg-info → enebootools-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: enebootools
-Version: 2.2.2
+Version: 2.3.1
 Summary: ERP tools for Eneboo
 Home-page: https://github.com/aulla/eneboo-tools
 Author: David Martínez Martí, José A. Fernández Fernández
@@ -26,7 +26,7 @@ Requires-Python: >=3.6.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.gplv3
 License-File: AUTHORS
-Requires-Dist: lxml==4.9.3
+Requires-Dist: lxml
 Requires-Dist: watchdog
 Dynamic: author
 Dynamic: author-email
@@ -35,7 +35,6 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
-Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/__init__.py

@@ -8,7 +8,7 @@ from pprint import pformat
 import enebootools.parseargs as pa
 
 
-__VERSION__ = "2.2.2"
+__VERSION__ = "2.3.1"
 QS_EXTEND_MODE = "legacy"
 
 

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/autoconfig/parsers.py

@@ -12,18 +12,18 @@ def get_int(x):
 def get_float(x):
     if type(x) is int: return x
     x = str(x)
-    if not re.match("[0-9\.]+$",x): raise ValueError("value %s is not a float" % repr(x))
+    if not re.match(r"[0-9\.]+$",x): raise ValueError("value %s is not a float" % repr(x))
     return float(x)
 
 def get_hostname(x):
     x = get_string(x)
-    if not re.match("[a-z0-9\.]+$",x): raise ValueError("value %s is not a valid hostname" % repr(x))
+    if not re.match(r"[a-z0-9\.]+$",x): raise ValueError("value %s is not a valid hostname" % repr(x))
     return x
 
 def get_identifier(x):
     if x == "None" or x is None: return None
     x = get_string(x)
-    if not re.match("\w+$",x): raise ValueError("value %s is not a valid identifier" % repr(x))
+    if not re.match(r"\w+$",x): raise ValueError("value %s is not a valid identifier" % repr(x))
     return x
     
 def get_ipaddress(x):

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/lib/etree/ElementPath.py

@@ -63,11 +63,11 @@ xpath_tokenizer_re = re.compile(
     "'[^']*'|\"[^\"]*\"|"
     "::|"
     "//?|"
-    "\.\.|"
-    "\(\)|"
-    "[/.*:\[\]\(\)@=])|"
-    "((?:\{[^}]+\})?[^/\[\]\(\)@=\s]+)|"
-    "\s+"
+    r"\.\.|"
+    r"\(\)|"
+    r"[/.*:\[\]\(\)@=])|"
+    r"((?:\{[^}]+\})?[^/\[\]\(\)@=\s]+)|"
+    r"\s+"
     )
 
 def xpath_tokenizer(pattern, namespaces=None):
@@ -176,7 +176,7 @@ def prepare_predicate(next, token):
                 if elem.get(key) == value:
                     yield elem
         return select
-    if signature == "-" and not re.match("\d+$", predicate[0]):
+    if signature == "-" and not re.match(r"\d+$", predicate[0]):
         # [tag]
         tag = predicate[0]
         def select(context, result):
@@ -184,7 +184,7 @@ def prepare_predicate(next, token):
                 if elem.find(tag) is not None:
                     yield elem
         return select
-    if signature == "-='" and not re.match("\d+$", predicate[0]):
+    if signature == "-='" and not re.match(r"\d+$", predicate[0]):
         # [tag='value']
         tag = predicate[0]
         value = predicate[-1]

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/lib/etree/ElementTree.py

@@ -1022,7 +1022,7 @@ _serialize = {
 #     invalid.
 
 def register_namespace(prefix, uri):
-    if re.match("ns\d+$", prefix):
+    if re.match(r"ns\d+$", prefix):
         raise ValueError("Prefix format reserved for internal use")
     for k, v in list(_namespace_map.items()):
         if k == uri or v == prefix:

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/mergetool/flpatchapipy.py

@@ -155,7 +155,7 @@ def pyclass_reader(iface, file_name, file_lines):
         line2 = latin1_to_ascii(line)
         m = re.search(r"#\s*@\s*([\w\.,;-]+)\s+([^ #]+)", line2)
         if m:
-            m2 = re.search("^\s*# @(\w+)( \w+)", line)
+            m2 = re.search(r"^\s*# @(\w+)( \w+)", line)
             if not m2:
                 iface.warn("Formato incorrecto de la linea %s" % repr(line))
             dtype = m.group(1)
@@ -174,7 +174,7 @@ def pyclass_reader(iface, file_name, file_lines):
             for l in class_lines[:32]:
                 # m = re.search("class\s+(?P<cname>\w+)\(((?P<cbase>\w+),)?(((?P<cfrom>\w.)+))\)",l)
                 m = re.search(
-                    "class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", l
+                    r"class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", l
                 )
                 if m:
                     heu_cname = m.group("cname")
@@ -184,46 +184,10 @@ def pyclass_reader(iface, file_name, file_lines):
             if heu_dtype is None:
                 heu_cnames = []
                 other_functions = []
-                """ for l in class_lines:
-                    m = re.search("def\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
-                    if m:
-                        heu_cname = m.group("cname")
-                        if heu_cname not in heu_cnames:
-                            heu_cnames.append(heu_cname)
-                        if heu_cname != cname:
-                            other_functions.append(l)
-                if len(heu_cnames) > 1:
-                    iface.error(
-                        "En la clase %s existen funciones para diferentes clases (file: %s)"
-                        % (cname, file_name)
-                    )
-                    for l in other_functions:
-                        iface.error(">>>" + l)
-
-                    if cname in heu_cnames:
-                        heu_cname = cname """
 
                 if heu_cname:
                     heu_dtype = "class_definition"
 
-            """ if heu_dtype and dtype != "delete_class":
-                heu_line = "# @%s %s #" % (heu_dtype, heu_cname)
-                myline = "# @%s %s #" % (dtype, cname)
-                if "_" in cname:
-                    iface.info(
-                        "La autodetección de contenido de bloques no funciona con clases que contengan el carácter de guión bajo como %r"
-                        % cname
-                    )
-                elif heu_line != myline:
-                    iface.error(
-                        "La definición de bloque %r no corresponde con el contenido (file: %s:%d) ... asumiendo '%s'"
-                        % (line2.strip(), file_name, n, heu_line)
-                    )
-                    dtype, cname = heu_dtype, heu_cname
-                    classpatch += ["@@ -%d,1 +%d,1 @@" % (n + 1, n + 1)]
-                    classpatch += ["-%s" % line2.rstrip()]
-                    classpatch += ["+%s" % heu_line] """
-
             npos = len(linelist)
             if dtype == "class_declaration":
                 if cname in classes:
@@ -284,7 +248,7 @@ def pyclass_reader(iface, file_name, file_lines):
                 linelist[-1].append(n)
             linelist.append(found)
         # const iface = new ifaceCtx( this );
-        m = re.search("self.iface\s*=\s*(?P<classname>\w+)\(\s*self\s*\)", line)
+        m = re.search(r"self.iface\s*=\s*(?P<classname>\w+)\(\s*self\s*\)", line)
 
         if m:
             iface_n = {
@@ -312,7 +276,7 @@ def pyclass_reader(iface, file_name, file_lines):
 def extract_class_decl_info(iface, text_lines):
     classdict = {}
     for n, line in enumerate(text_lines):
-        m = re.search("class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", line)
+        m = re.search(r"class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", line)
         if m:
             cname = m.group("cname")
             classdict[cname] = {
@@ -692,7 +656,7 @@ def patch_py_dir(iface, base, patch):
             line = line.strip()
             if len(line) == 0:
                 continue
-            match = re.match("^([\w,]+) \((\w+)\) ([\w,]+)", line)
+            match = re.match(r"^([\w,]+) \((\w+)\) ([\w,]+)", line)
             if not match:
                 iface.error("Línea de movimiento de clases malformada: %s" % (repr(line)))
                 continue
@@ -1292,7 +1256,7 @@ def diff_py_dir(iface, base, final):
                 prev_lines, post_lines = unprinted_lines[:idx], unprinted_lines[idx + 1 :]
                 if len(prev_lines) > 3:
                     for j in reversed(prev_lines):
-                        if re.search("^\s*(def|class) ", diff[j]):
+                        if re.search(r"^\s*(def|class) ", diff[j]):
                             break
                     omitted = len(prev_lines[: prev_lines.index(j)])
                     if omitted > 20:
@@ -1971,7 +1935,7 @@ def fix_class(iface, flbase, clbase, cdbase, classname, **updates):
         end_line = clbase["list"][decl_block_no][3]
         for n, line in enumerate(flbase[line_no:end_line], line_no):
             m_it = re.finditer(
-                "def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)",
+                r"def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)",
                 line,
             )
             for m in m_it:
@@ -2005,7 +1969,7 @@ def check_class(iface, flbase, clbase, cdbase, classname):
     for n, line in enumerate(flbase[line_no:end_line], line_no):
         # match = list(re.finditer("def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)", line))
         match = list(
-            re.finditer("super\((?P<fname>\w+),\s*self\)\.__init__\(\s*context\s*\)", line)
+            re.finditer(r"super\((?P<fname>\w+),\s*self\)\.__init__\(\s*context\s*\)", line)
         )
         if match:
             line_found.append(line)

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/mergetool/flpatchlxml.py

@@ -862,7 +862,7 @@ class XMLDiffer(object):
                             newelement = e
 
                     if newelement is None:  # Intentar mas a fondo:
-                        m = re.match("(\w+)\[(\w+),(\d+)\]", p0)
+                        m = re.match(r"(\w+)\[(\w+),(\d+)\]", p0)
                         if m:
                             tagname = m.group(1)
                             number = int(m.group(3)) - 1

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/mergetool/flpatchmodel.py

@@ -154,7 +154,7 @@ def modelclass_reader(iface, file_name, file_lines):
         line2 = latin1_to_ascii(line)
         m = re.search(r"#\s*@\s*([\w\.,;-]+)\s+([^ #]+)", line2)
         if m:
-            m2 = re.search("^\s*# @(\w+)( \w+)", line)
+            m2 = re.search(r"^\s*# @(\w+)( \w+)", line)
             if not m2:
                 iface.warn("Formato incorrecto de la linea %s" % repr(line))
             dtype = m.group(1)
@@ -173,7 +173,7 @@ def modelclass_reader(iface, file_name, file_lines):
             for l in class_lines[:32]:
                 # m = re.search("class\s+(?P<cname>\w+)\(((?P<cbase>\w+),)?(((?P<cfrom>\w.)+))\)",l)
                 m = re.search(
-                    "class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", l
+                    r"class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", l
                 )
                 if m:
                     heu_cname = m.group("cname")
@@ -184,7 +184,7 @@ def modelclass_reader(iface, file_name, file_lines):
                 heu_cnames = []
                 other_functions = []
                 for l in class_lines:
-                    m = re.search("def\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
+                    m = re.search(r"def\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
                     if m:
                         heu_cname = m.group("cname")
                         if heu_cname not in heu_cnames:
@@ -283,7 +283,7 @@ def modelclass_reader(iface, file_name, file_lines):
                 linelist[-1].append(n)
             linelist.append(found)
         # const iface = new ifaceCtx( this );
-        m = re.search("self.iface\s*=\s*(?P<classname>\w+)\(\s*self\s*\)", line)
+        m = re.search(r"self.iface\s*=\s*(?P<classname>\w+)\(\s*self\s*\)", line)
 
         if m:
             iface_n = {
@@ -311,7 +311,7 @@ def modelclass_reader(iface, file_name, file_lines):
 def extract_class_decl_info(iface, text_lines):
     classdict = {}
     for n, line in enumerate(text_lines):
-        m = re.search("class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", line)
+        m = re.search(r"class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", line)
         if m:
             cname = m.group("cname")
             classdict[cname] = {
@@ -691,7 +691,7 @@ def patch_model_dir(iface, base, patch):
             line = line.strip()
             if len(line) == 0:
                 continue
-            match = re.match("^([\w,]+) \((\w+)\) ([\w,]+)", line)
+            match = re.match(r"^([\w,]+) \((\w+)\) ([\w,]+)", line)
             if not match:
                 iface.error("Línea de movimiento de clases malformada: %s" % (repr(line)))
                 continue
@@ -1291,7 +1291,7 @@ def diff_model_dir(iface, base, final):
                 prev_lines, post_lines = unprinted_lines[:idx], unprinted_lines[idx + 1 :]
                 if len(prev_lines) > 3:
                     for j in reversed(prev_lines):
-                        if re.search("^\s*(def|class) ", diff[j]):
+                        if re.search(r"^\s*(def|class) ", diff[j]):
                             break
                     omitted = len(prev_lines[: prev_lines.index(j)])
                     if omitted > 20:
@@ -1986,7 +1986,7 @@ def fix_class(iface, flbase, clbase, cdbase, classname, **updates):
         end_line = clbase["list"][decl_block_no][3]
         for n, line in enumerate(flbase[line_no:end_line], line_no):
             m_it = re.finditer(
-                "def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)",
+                r"def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)",
                 line,
             )
             for m in m_it:
@@ -2020,7 +2020,7 @@ def check_class(iface, flbase, clbase, cdbase, classname):
     for n, line in enumerate(flbase[line_no:end_line], line_no):
         # match = list(re.finditer("def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)", line))
         match = list(
-            re.finditer("super\((?P<fname>\w+),\s*self\)\.__init__\(\s*context\s*\)", line)
+            re.finditer(r"super\((?P<fname>\w+),\s*self\)\.__init__\(\s*context\s*\)", line)
         )
         if match:
             line_found.append(line)

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/mergetool/flpatchpy.py

@@ -154,7 +154,7 @@ def pyclass_reader(iface, file_name, file_lines):
         line2 = latin1_to_ascii(line)
         m = re.search(r"#\s*@\s*([\w\.,;-]+)\s+([^ #]+)", line2)
         if m:
-            m2 = re.search("^\s*# @(\w+)( \w+)", line)
+            m2 = re.search(r"^\s*# @(\w+)( \w+)", line)
             if not m2:
                 iface.warn("Formato incorrecto de la linea %s" % repr(line))
             dtype = m.group(1)
@@ -173,7 +173,7 @@ def pyclass_reader(iface, file_name, file_lines):
             for l in class_lines[:32]:
                 # m = re.search("class\s+(?P<cname>\w+)\(((?P<cbase>\w+),)?(((?P<cfrom>\w.)+))\)",l)
                 m = re.search(
-                    "class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", l
+                    r"class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", l
                 )
                 if m:
                     heu_cname = m.group("cname")
@@ -184,7 +184,7 @@ def pyclass_reader(iface, file_name, file_lines):
                 heu_cnames = []
                 other_functions = []
                 for l in class_lines:
-                    m = re.search("def\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
+                    m = re.search(r"def\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
                     if m:
                         heu_cname = m.group("cname")
                         if heu_cname not in heu_cnames:
@@ -283,7 +283,7 @@ def pyclass_reader(iface, file_name, file_lines):
                 linelist[-1].append(n)
             linelist.append(found)
         # const iface = new ifaceCtx( this );
-        m = re.search("self.iface\s*=\s*(?P<classname>\w+)\(\s*self\s*\)", line)
+        m = re.search(r"self.iface\s*=\s*(?P<classname>\w+)\(\s*self\s*\)", line)
 
         if m:
             iface_n = {
@@ -311,7 +311,7 @@ def pyclass_reader(iface, file_name, file_lines):
 def extract_class_decl_info(iface, text_lines):
     classdict = {}
     for n, line in enumerate(text_lines):
-        m = re.search("class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", line)
+        m = re.search(r"class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", line)
         if m:
             cname = m.group("cname")
             classdict[cname] = {
@@ -691,7 +691,7 @@ def patch_py_dir(iface, base, patch):
             line = line.strip()
             if len(line) == 0:
                 continue
-            match = re.match("^([\w,]+) \((\w+)\) ([\w,]+)", line)
+            match = re.match(r"^([\w,]+) \((\w+)\) ([\w,]+)", line)
             if not match:
                 iface.error("Línea de movimiento de clases malformada: %s" % (repr(line)))
                 continue
@@ -1291,7 +1291,7 @@ def diff_py_dir(iface, base, final):
                 prev_lines, post_lines = unprinted_lines[:idx], unprinted_lines[idx + 1 :]
                 if len(prev_lines) > 3:
                     for j in reversed(prev_lines):
-                        if re.search("^\s*(def|class) ", diff[j]):
+                        if re.search(r"^\s*(def|class) ", diff[j]):
                             break
                     omitted = len(prev_lines[: prev_lines.index(j)])
                     if omitted > 20:
@@ -1970,7 +1970,7 @@ def fix_class(iface, flbase, clbase, cdbase, classname, **updates):
         end_line = clbase["list"][decl_block_no][3]
         for n, line in enumerate(flbase[line_no:end_line], line_no):
             m_it = re.finditer(
-                "def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)",
+                r"def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)",
                 line,
             )
             for m in m_it:
@@ -2004,7 +2004,7 @@ def check_class(iface, flbase, clbase, cdbase, classname):
     for n, line in enumerate(flbase[line_no:end_line], line_no):
         # match = list(re.finditer("def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)", line))
         match = list(
-            re.finditer("super\((?P<fname>\w+),\s*self\)\.__init__\(\s*context\s*\)", line)
+            re.finditer(r"super\((?P<fname>\w+),\s*self\)\.__init__\(\s*context\s*\)", line)
         )
         if match:
             line_found.append(line)

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/mergetool/flpatchqs.py

@@ -154,7 +154,7 @@ def qsclass_reader(iface, file_name, file_lines):
         line2 = latin1_to_ascii(line)
         m = re.search(r"/\*\*?\s*@\s*([\w\.,;-]+)\s+([^ */]+)?\s*\*/", line2)
         if m:
-            m2 = re.search("^\s*/\*\* @(\w+)( \w+)?\s*\*/\s*$", line)
+            m2 = re.search(r"^\s*/\*\* @(\w+)( \w+)?\s*\*/\s*$", line)
             if not m2:
                 iface.warn("Formato incorrecto de la linea %s" % repr(line))
             dtype = m.group(1)
@@ -172,7 +172,7 @@ def qsclass_reader(iface, file_name, file_lines):
             heu_from = None
             for l in class_lines[:32]:
                 m = re.search(
-                    "class\s+(?P<cname>\w+)(\s+extends\s+(?P<cbase>\w+))?(\s+/\*\*\s+%from:\s+(?P<cfrom>\w+)\s+\*/)?",
+                    r"class\s+(?P<cname>\w+)(\s+extends\s+(?P<cbase>\w+))?(\s+/\*\*\s+%from:\s+(?P<cfrom>\w+)\s+\*/)?",
                     l,
                 )
                 if m:
@@ -184,7 +184,7 @@ def qsclass_reader(iface, file_name, file_lines):
                 heu_cnames = []
                 other_functions = []
                 for l in class_lines:
-                    m = re.search("^function\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
+                    m = re.search(r"^function\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
                     if m:
                         heu_cname = m.group("cname")
                         if heu_cname not in heu_cnames:
@@ -283,7 +283,7 @@ def qsclass_reader(iface, file_name, file_lines):
                 linelist[-1].append(n)
             linelist.append(found)
         # const iface = new ifaceCtx( this );
-        m = re.search("(const|var)\s+iface\s*=\s*new\s*(?P<classname>\w+)\(\s*this\s*\);?", line)
+        m = re.search(r"(const|var)\s+iface\s*=\s*new\s*(?P<classname>\w+)\(\s*this\s*\);?", line)
 
         if m:
             iface_n = {
@@ -311,7 +311,7 @@ def extract_class_decl_info(iface, text_lines):
     classdict = {}
     for n, line in enumerate(text_lines):
         m = re.search(
-            "class\s+(?P<cname>\w+)(\s+extends\s+(?P<cbase>\w+))?(\s+/\*\*\s+%from:\s+(?P<cfrom>\w+)\s+\*/)?",
+            r"class\s+(?P<cname>\w+)(\s+extends\s+(?P<cbase>\w+))?(\s+/\*\*\s+%from:\s+(?P<cfrom>\w+)\s+\*/)?",
             line,
         )
         if m:
@@ -688,7 +688,7 @@ def patch_qs_dir(iface, base, patch):
             line = line.strip()
             if len(line) == 0:
                 continue
-            match = re.match("^([\w,]+) \((\w+)\) ([\w,]+)", line)
+            match = re.match(r"^([\w,]+) \((\w+)\) ([\w,]+)", line)
             if not match:
                 iface.error("Línea de movimiento de clases malformada: %s" % (repr(line)))
                 continue
@@ -1287,7 +1287,7 @@ def diff_qs_dir(iface, base, final):
                 prev_lines, post_lines = unprinted_lines[:idx], unprinted_lines[idx + 1 :]
                 if len(prev_lines) > 3:
                     for j in reversed(prev_lines):
-                        if re.search("^\s*(function|class) ", diff[j]):
+                        if re.search(r"^\s*(function|class) ", diff[j]):
                             break
                     omitted = len(prev_lines[: prev_lines.index(j)])
                     if omitted > 20:
@@ -2023,7 +2023,7 @@ def fix_class(iface, flbase, clbase, cdbase, classname, **updates):
         decl_block_no = clbase["decl"][classname]
         end_line = clbase["list"][decl_block_no][3]
         for n, line in enumerate(flbase[line_no:end_line], line_no):
-            m_it = re.finditer("(?P<fname>\w+)\s*\(\s*context\s*\);?", line)
+            m_it = re.finditer(r"(?P<fname>\w+)\s*\(\s*context\s*\);?", line)
             for m in m_it:
                 if m.group("fname") != cdbase[dclassname]["extends"]:
                     continue
@@ -2053,7 +2053,7 @@ def check_class(iface, flbase, clbase, cdbase, classname):
     found = []
     line_found = []
     for n, line in enumerate(flbase[line_no:end_line], line_no):
-        match = list(re.finditer("(?P<fname>\w+)\s*\(\s*context\s*\);", line))
+        match = list(re.finditer(r"(?P<fname>\w+)\s*\(\s*context\s*\);", line))
         if match:
             line_found.append(line)
             found += match
@@ -2080,7 +2080,7 @@ def qsclass_functions(iface, file_lines):
         line2 = latin1_to_ascii(line)
         m = re.search(r"/\*\*?\s*@\s*([\w\.,;-]+)\s+([^ */]+)?\s*\*/", line2)
         if m:
-            m2 = re.search("^\s*/\*\* @(\w+)( \w+)?\s*\*/\s*$", line)
+            m2 = re.search(r"^\s*/\*\* @(\w+)( \w+)?\s*\*/\s*$", line)
             if not m2:
                 iface.warn("Formato incorrecto de la linea %s" % repr(line))
             dtype = m.group(1)
@@ -2098,7 +2098,7 @@ def qsclass_functions(iface, file_lines):
             heu_from = None
             for l in class_lines[:32]:
                 m = re.search(
-                    "class\s+(?P<cname>\w+)(\s+extends\s+(?P<cbase>\w+))?(\s+/\*\*\s+%from:\s+(?P<cfrom>\w+)\s+\*/)?",
+                    r"class\s+(?P<cname>\w+)(\s+extends\s+(?P<cbase>\w+))?(\s+/\*\*\s+%from:\s+(?P<cfrom>\w+)\s+\*/)?",
                     l,
                 )
                 if m:
@@ -2110,7 +2110,7 @@ def qsclass_functions(iface, file_lines):
                 heu_cnames = []
                 other_functions = []
                 for l in class_lines:
-                    m = re.search("^function\s+(?P<cname>[a-zA-Z0-9]+)_(?P<fname>\w+)", l)
+                    m = re.search(r"^function\s+(?P<cname>[a-zA-Z0-9]+)_(?P<fname>\w+)", l)
                     if m:
                         fun_name = m.group("fname")
                         class_name = m.group("cname")

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/mergetool/flpatchtest.py

@@ -154,7 +154,7 @@ def testclass_reader(iface, file_name, file_lines):
         line2 = latin1_to_ascii(line)
         m = re.search(r"#\s*@\s*([\w\.,;-]+)\s+([^ #]+)?\s*#", line2)
         if m:
-            m2 = re.search("^\s*# @(\w+)( \w+)?\s#\s*$", line)
+            m2 = re.search(r"^\s*# @(\w+)( \w+)?\s#\s*$", line)
             if not m2:
                 iface.warn("Formato incorrecto de la linea %s" % repr(line))
             dtype = m.group(1)
@@ -173,7 +173,7 @@ def testclass_reader(iface, file_name, file_lines):
             for l in class_lines[:32]:
                 # m = re.search("class\s+(?P<cname>\w+)\(((?P<cbase>\w+),)?(((?P<cfrom>\w.)+))\)",l)
                 m = re.search(
-                    "class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", l
+                    r"class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", l
                 )
                 if m:
                     heu_cname = m.group("cname")
@@ -184,7 +184,7 @@ def testclass_reader(iface, file_name, file_lines):
                 heu_cnames = []
                 other_functions = []
                 for l in class_lines:
-                    m = re.search("def\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
+                    m = re.search(r"def\s+(?P<cname>[a-zA-Z0-9]+)_\w+", l)
                     if m:
                         heu_cname = m.group("cname")
                         if heu_cname not in heu_cnames:
@@ -283,7 +283,7 @@ def testclass_reader(iface, file_name, file_lines):
                 linelist[-1].append(n)
             linelist.append(found)
         # const iface = new ifaceCtx( this );
-        m = re.search("self.iface\s*=\s*(?P<classname>\w+)\(\s*self\s*\)", line)
+        m = re.search(r"self.iface\s*=\s*(?P<classname>\w+)\(\s*self\s*\)", line)
 
         if m:
             iface_n = {
@@ -311,7 +311,7 @@ def testclass_reader(iface, file_name, file_lines):
 def extract_class_decl_info(iface, text_lines):
     classdict = {}
     for n, line in enumerate(text_lines):
-        m = re.search("class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", line)
+        m = re.search(r"class\s+(?P<cname>([\w.])+)\(((?P<cbase>.+))(,(?P<cfrom>([\w.])+))?\)", line)
         if m:
             cname = m.group("cname")
             classdict[cname] = {
@@ -691,7 +691,7 @@ def patch_test_dir(iface, base, patch):
             line = line.strip()
             if len(line) == 0:
                 continue
-            match = re.match("^([\w,]+) \((\w+)\) ([\w,]+)", line)
+            match = re.match(r"^([\w,]+) \((\w+)\) ([\w,]+)", line)
             if not match:
                 iface.error("Línea de movimiento de clases malformada: %s" % (repr(line)))
                 continue
@@ -1292,7 +1292,7 @@ def diff_test_dir(iface, base, final):
                 prev_lines, post_lines = unprinted_lines[:idx], unprinted_lines[idx + 1 :]
                 if len(prev_lines) > 3:
                     for j in reversed(prev_lines):
-                        if re.search("^\s*(def|class) ", diff[j]):
+                        if re.search(r"^\s*(def|class) ", diff[j]):
                             break
                     omitted = len(prev_lines[: prev_lines.index(j)])
                     if omitted > 20:
@@ -1984,7 +1984,7 @@ def fix_class(iface, flbase, clbase, cdbase, classname, **updates):
         end_line = clbase["list"][decl_block_no][3]
         for n, line in enumerate(flbase[line_no:end_line], line_no):
             m_it = re.finditer(
-                "def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)",
+                r"def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)",
                 line,
             )
             for m in m_it:
@@ -2018,7 +2018,7 @@ def check_class(iface, flbase, clbase, cdbase, classname):
     for n, line in enumerate(flbase[line_no:end_line], line_no):
         # match = list(re.finditer("def\s*__init__\(self, context\s*=\s*None\):\n\s*super\(?P<fname>\w+,\s*self\)\.__init__\(\s*context\s*\)", line))
         match = list(
-            re.finditer("super\((?P<fname>\w+),\s*self\)\.__init__\(\s*context\s*\)", line)
+            re.finditer(r"super\((?P<fname>\w+),\s*self\)\.__init__\(\s*context\s*\)", line)
         )
         if match:
             line_found.append(line)

{enebootools-2.2.2 → enebootools-2.3.1}/enebootools/packager/pkgjoiner.py

@@ -152,7 +152,7 @@ def createpkg(iface, modulefolder, dst_file, emulate_mode):
             break
 
         files = find_files(fpath)
-        modulename = re.search("^\w+", module).group(0)
+        modulename = re.search(r"^\w+", module).group(0)
         if modulename in list_modules:
             print("módulo %s (%s) Duplicado. Ignorado." % (modulename, fpath))
             continue

{enebootools-2.2.2 → enebootools-2.3.1/enebootools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: enebootools
-Version: 2.2.2
+Version: 2.3.1
 Summary: ERP tools for Eneboo
 Home-page: https://github.com/aulla/eneboo-tools
 Author: David Martínez Martí, José A. Fernández Fernández
@@ -26,7 +26,7 @@ Requires-Python: >=3.6.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.gplv3
 License-File: AUTHORS
-Requires-Dist: lxml==4.9.3
+Requires-Dist: lxml
 Requires-Dist: watchdog
 Dynamic: author
 Dynamic: author-email
@@ -35,7 +35,6 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
-Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

enebootools-2.3.1/enebootools.egg-info/requires.txt

@@ -0,0 +1,2 @@
+lxml
+watchdog

enebootools-2.2.2/enebootools.egg-info/requires.txt

@@ -1,2 +0,0 @@
-lxml==4.9.3
-watchdog