rda-python-common 1.0.48__tar.gz → 1.0.50__tar.gz

{rda_python_common-1.0.48 → rda_python_common-1.0.50}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.48
+Version: 1.0.50
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common

{rda_python_common-1.0.48 → rda_python_common-1.0.50}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "1.0.48"
+version = "1.0.50"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_common-1.0.48 → rda_python_common-1.0.50}/src/rda_python_common/PgLOG.py

@@ -28,6 +28,7 @@ import time
 import socket
 import shutil
 import traceback
+from unidecode import unidecode
 
 # define some constants for logging actions
 MSGLOG = (0x00001)   # logging message
@@ -1579,33 +1580,16 @@ def check_process_host(hosts, chost = None, mflag = None, pinfo = None, logact =
    return ret
 
 #
-# convert special characters
+# convert special foreign characters into ascii characters
 #
 def convert_chars(name, default = 'X'):
-
    if not name: return default
-   if re.match(r'^[a-zA-Z0-9]+$', name): return name  # no need convert
-
-   z = ord('z')
-   newchrs = ochrs = ''
-   for i in range(len(name)):
-      ch = name[i]
-      if re.match(r'^[a-zA-Z0-9]$', ch):
-         newchrs += ch
-      elif (ch == ' ' or ch == '_') and newchrs:
-         newchrs += '_'
-      elif ord(ch) > z and ochrs != None:
-         if not ochrs:
-            ochrs = None
-            with open(PGLOG['DSSHOME'] + "/lib/ExtChrs.txt", "r") as CHR:
-               ochrs = CHR.readline()
-               nchrs = CHR.readline()
-            if ochrs is None: continue
-         idx = ochrs.find(ch)
-         if idx >= 0: newchrs += nchrs[idx]
-
-   if newchrs:
-      return newchrs
+   if re.match(r'^[a-zA-Z0-9]+$', name): return name  # conversion not needed
+   decoded_name = unidecode(name).strip()
+   # remove any non-alphanumeric and non-underscore characters
+   cleaned_name = re.sub(r'[^a-zA-Z0-9_]', '', decoded_name)
+   if cleaned_name:
+      return cleaned_name
    else:
       return default
 

{rda_python_common-1.0.48 → rda_python_common-1.0.50}/src/rda_python_common/PgOPT.py

@@ -1683,9 +1683,16 @@ def send_request_email_notice(pgrqst, errmsg, fcount, rstat, readyfile = None, p
 
    for ekey in einfo:
       if ekey == 'CCD' and not einfo['CCD']:
-         ebuf = re.sub(r'Cc:\s*<CCD>\s*', '', ebuf)
+         mp = r'Cc:\s*<CCD>\s*'
+         rep = ''
       else:
-         ebuf = re.sub(r'<{}>'.format(ekey), einfo[ekey], ebuf)
+         mp = r'<{}>'.format(ekey)
+         rep = einfo[ekey]
+         if rep is None:
+            PgLOG.pglog("{}.{}: None ekey value for reuqest email".format(pgrqst['rindex'], ekey),
+                        PGOPT['wrnlog']|PgLOG.FRCLOG)
+            rep = ''
+      ebuf = re.sub(mp, rep, ebuf)
 
    if PgLOG.PGLOG['DSCHECK'] and not pgpart:
       tbl = "dscheck"

{rda_python_common-1.0.48 → rda_python_common-1.0.50}/src/rda_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.48
+Version: 1.0.50
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common