rda-python-common 1.0.47__py3-none-any.whl → 1.0.49__py3-none-any.whl

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
@@ -335,7 +336,7 @@ def send_python_email(subject = None, receiver = None, msg = None, sender = None
       emlmsg['Cc'] = cc
       logmsg += " Cc'd " + cc
    if not subject: subject = "Message from {}-{}".format(PGLOG['HOSTNAME'], get_command())
-   if not re.search(r'!$', subject): subject += '!'
+   # if not re.search(r'!$', subject): subject += '!'
    emlmsg['Subject'] = subject
    if CPID['CPID']: logmsg += " in " + CPID['CPID']
    logmsg += ", Subject: {}\n".format(subject)
@@ -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.47.dist-info → rda_python_common-1.0.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.47
+Version: 1.0.49
 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.47.dist-info → rda_python_common-1.0.49.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rda_python_common/PgCMD.py,sha256=EYjG2Z4zEnvsXE1z-jt5UaNoEKxnOYYiMMzvW6HrKA4,20597
 rda_python_common/PgDBI.py,sha256=nAov-B-B9XZ7p7rX1ZU4TcjAItSXVq18yD0Xe80TkwY,74962
 rda_python_common/PgFile.py,sha256=obl9Pj3yFnjrOJUTFiEHK7ZbG2Ic_m3dT0NqO7rGvOs,99370
-rda_python_common/PgLOG.py,sha256=99prfZRwj9wTUCldv1JMtpgltK_HdNuVfNHv6TIcxVg,55723
+rda_python_common/PgLOG.py,sha256=RLcsUzHjPqkaoT_jJStG6PoUJzUe5i3NJ8T_bmFhAZA,55387
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
 rda_python_common/PgOPT.py,sha256=7eqERFMz2gkKIgHucjwxgBFE9mQ_mUsy_OlUqHyAHrw,56014
 rda_python_common/PgSIG.py,sha256=t0yF2vnLgb6TKEBwIp7pEemvp-N29tjkLMoPETKgiZo,35797
 rda_python_common/PgSplit.py,sha256=QKPbF55m8KCTGmwVwL3uG_nuylCC4FSVfLuXeLjJHbE,8816
 rda_python_common/PgUtil.py,sha256=OqESKCd72b9g8m8jwjPJhXDtPYlW6G8oSOhwChvz2Cg,48600
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rda_python_common-1.0.47.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.47.dist-info/METADATA,sha256=nktxdbeH-g992tcm2GDxithSx-cWrh3oIvlZDfxbFtI,716
-rda_python_common-1.0.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.47.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.47.dist-info/RECORD,,
+rda_python_common-1.0.49.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.49.dist-info/METADATA,sha256=buXrFXMfaOMJ0eOCoJfNPzDLtVCPYinPU5F2uMn9avo,716
+rda_python_common-1.0.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_common-1.0.49.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.49.dist-info/RECORD,,