pydan 2.2__tar.gz → 2.4__tar.gz

{pydan-2.2/src → usr/local/lib/python3.8/dist-packages/pydan}/jdata.py

@@ -196,7 +196,7 @@ def replacevarsold(d, varlist, unknownempty=False, emptyremove=False, unknownnul
 			__debugiter=__debugiter+1
 			for i in d[k]:
 				for di in range(0,__debugiter): print("    ", end="")
-				print(f"* item {i}")
+				#print(f"* item {i}")
 				o[k].append(replacevarsold(i, varlist, unknownempty=unknownempty, emptyremove=emptyremove, unknownnull=unknownnull, emptynull=emptynull, __debugiter=__debugiter))
 			continue
 		else:
@@ -226,7 +226,8 @@ def replacevarsold(d, varlist, unknownempty=False, emptyremove=False, unknownnul
 								else: val="null"
 							else:
 								continue
-					if d[k]==f"${sk}$":
+					#if d[k]==f"${sk}$":  # python 3.6
+					if d[k]=="$"+sk+"$":  # python 3.6
 						# si el valor es exacto ("$var$"), reemplazamos por el tipo de objeto de varlist
 						d[k]=val
 					else:
@@ -264,7 +265,8 @@ def replacevars(data, varlist, flags=[], __debugiter=0):
 		for k,v in data.items():
 			if __debug:
 				for di in range(0,__debugiter): print("    ", end="")
-				print(f"\033[33m- Item '{k}' [{type(data[k]).__name__}]\033[0m")
+				#print(f"\033[33m- Item '{k}' [{type(data[k]).__name__}]\033[0m")  # python 3.6
+				print("\033[33m- Item '"+k+"' ["+type(data[k]).__name__+"]\033[0m")  # python 3.6
 			if type(v)==str:
 				r=replacevars_str(v, varlist, __debugiter=__debugiter)
 				add=True
@@ -288,7 +290,8 @@ def replacevars(data, varlist, flags=[], __debugiter=0):
 		for k in data:
 			if __debug:
 				for di in range(0,__debugiter): print("    ", end="")
-				print(f"\033[33m- Item '{k}' [{type(k).__name__}]\033[0m")
+				#print(f"\033[33m- Item '{k}' [{type(k).__name__}]\033[0m")
+				print("\033[33m- Item '"+k+"' ["+type(k).__name__+"]\033[0m")
 			oi=replacevars(k, varlist, flags=flags, __debugiter=__debugiter)
 			o.append(oi)
 		return o
@@ -302,7 +305,8 @@ def replacevars(data, varlist, flags=[], __debugiter=0):
 		for k in data:
 			if __debug:
 				for di in range(0,__debugiter): print("    ", end="")
-				print(f"\033[33m- Item '{k}' [{type(k).__name__}]\033[0m")
+				#print(f"\033[33m- Item '{k}' [{type(k).__name__}]\033[0m")
+				print("\033[33m- Item '"+k+"' ["+type(k).__name__+"]\033[0m")
 			oi=replacevars(k, varlist, flags=flags, __debugiter=__debugiter)
 			o.add(oi)
 		return o
@@ -310,7 +314,8 @@ def replacevars(data, varlist, flags=[], __debugiter=0):
 	# unknown!
 	if __debug:
 		for di in range(0,__debugiter): print("    ", end="")
-		print(f"\033[1;31m¿{type(data).__name__}?\033[0m")
+		#print(f"\033[1;31m¿{type(data).__name__}?\033[0m")
+		print("\033[1;31m¿"+type(data).__name__+"?\033[0m")
 	return data
 
 #	for k in d:
@@ -339,7 +344,8 @@ def replacevars_str(data, varlist, __debugiter=0):
 	#__debug=True
 	if __debug:
 		for di in range(0,__debugiter+1): print("    ", end="")
-		print(f"\033[34mreplacevars2_str: '{data}'\033[0m", end="")
+		#print(f"\033[34mreplacevars2_str: '{data}'\033[0m", end="")
+		print("\033[34mreplacevars2_str: '"+data+"'\033[0m", end="")
 	out=data
 	p=re.compile("\\$([a-zA-Z0-9_]*)\\$")
 	vars=p.findall(data)
@@ -354,7 +360,7 @@ def replacevars_str(data, varlist, __debugiter=0):
 		# Hay variables
 		for sk in vars:
 			if __debug:
-				print(f" (repl {sk})", end="")
+				print(" (repl "+sk+")", end="")
 			if sk not in varlist: continue
 			val=varlist.get(sk)
 			#if val is None:
@@ -367,7 +373,7 @@ def replacevars_str(data, varlist, __debugiter=0):
 			#			continue
 
 			# TODO: no borrar variables que no existen!
-			if data==f"${sk}$":
+			if data=="$"+sk+"$":
 				# si el valor es exacto ("$var$"), reemplazamos por el tipo de objeto de varlist
 				out=val
 			else:
@@ -377,7 +383,7 @@ def replacevars_str(data, varlist, __debugiter=0):
 		#if(out=="$null$" and emptynull): out=None
 		#if(out=="$null$"): out=None
 		#if(out=="" and emptyremove): out=None  # ???? TODO
-	if __debug: print(f"\033[34m -> '{out}' [{type(out).__name__}]\033[0m")
+	if __debug: print("\033[34m -> '"+out+"' ["+type(out).__name__+"]\033[0m")
 	return out
 #}}}
 
@@ -545,7 +551,7 @@ def json_parser_hook(js):
 			dt=dt.replace(tzinfo=timezone.utc)
 			out[key]=dt
 			continue
-		except: pass
+		except Exception: pass
 		# Hora con timezone con milisegundos
 		try:
 			dt=re.sub("Z$", "UTC",value)
@@ -553,17 +559,17 @@ def json_parser_hook(js):
 			dt=dt.replace(tzinfo=timezone.utc)
 			out[key]=dt
 			continue
-		except: pass
+		except Exception: pass
 		# Hora sin timezone sin milisegundos
 		try:
 			out[key]=datetime.strptime(value, "%Y-%m-%dT%H:%M:%S")
 			continue
-		except: pass
+		except Exception: pass
 		# Hora sin timezone con milisegundos
 		try:
 			out[key]=datetime.strptime(value, "%Y-%m-%dT%H:%M:%S.%f")
 			continue
-		except: pass
+		except Exception: pass
 	return out
 
 # dict -> json

{pydan-2.2 → usr/local/lib/python3.8/dist-packages/pydan-2.4.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: pydan
-Version: 2.2
+Version: 2.4
 Summary: Python3 Data Utils
 Home-page: UNKNOWN
 Author: Jose Biosca Martín

{pydan-2.2/pydan.egg-info → usr/local/lib/python3.8/dist-packages/pydan-2.4.egg-info}/requires.txt

@@ -1,5 +1,5 @@
 colored_traceback
 dicttoxml
+ruamel.yaml
 setproctitle
-setuptools
 xmltodict

pydan-2.2/pydan.egg-info/PKG-INFO

@@ -1,13 +0,0 @@
-Metadata-Version: 1.2
-Name: pydan
-Version: 2.2
-Summary: Python3 Data Utils
-Home-page: UNKNOWN
-Author: Jose Biosca Martín
-Author-email: jbiosca@zone-sys.net
-License: UNKNOWN
-Description: UNKNOWN
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.6

pydan-2.2/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-

pydan-2.2/setup.py

@@ -1,30 +0,0 @@
-#!/usr/bin/env python3
-
-from setuptools import setup
-
-setup(
-	name="pydan",
-	version='2.2',
-	description='Python3 Data Utils',
-	author='Jose Biosca Martín',
-	author_email='jbiosca@zone-sys.net',
-	#url='https://zone-sys.net/',
-	python_requires='>=3.6',
-	#packages=["lib"],
-	packages=["pydan"],
-	package_dir={"pydan": "src"},
-	#py_modules=['ivscript', 'jdata', 'josen', 'run']
-	install_requires=[
-		'setuptools',
-		'setproctitle',
-		'colored_traceback',
-		'dicttoxml',
-		'xmltodict',
-#		'ruamel.yaml',
-	],
-	classifiers=[
-		'Development Status :: 5 - Production/Stable',
-		"License :: OSI Approved :: MIT License",
-		#'Topic :: Software development',
-	],
-)

pydan-2.2/test/test-jdata-replacevars.py

@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-
-#from pydan import jdata
-
-import sys
-sys.path.append('..')
-from src import jdata
-
-ret=0
-
-# Comprobamos reemplazo de multiples variables en un string
-data={"numbers":"$n1$,$n2$,$n3$,$nx$"}
-repl=jdata.replacevars(data, {"n1":"one", "n2":"two", "n3":"three", "n4":"four"})
-if repl["numbers"]!="one,two,three,$nx$":
-	print("ERROR reemplazando multiples variables en un mismo string")
-	print(repl["numbers"])
-	ret=1
-else:
-	print("OK: Reemplazo de multiples variables en un mismo string")
-
-# Comprobamos reemplazo de distintos tipos de datos
-data={
-	"rep_str":"$str$",
-	"rep_num":"$num$",
-	"rep_list":"$list$",
-	"rep_dict":"$dict$",
-	"rep_null":"$null$",
-	"rep_empty":"$empty$",
-	"rep_unk":"$unk$",
-	"ori_empty":"",
-	"ori_null":None,
-	"ori_list": [ "a", "b" ],
-	"ori_dict": { "ori_a":0, "ori_b":1 },
-}
-repl=jdata.replacevars(data, {"str":"str", "num":1, "list":["a","b"], "dict":{"a":0,"b":1},"null":None,"empty":""})
-repljson=jdata.tojson(repl)
-if repljson!='{"rep_str":"str","rep_num":1,"rep_list":["a","b"],"rep_dict":{"a":0,"b":1},"rep_null":null,"rep_empty":"","rep_unk":"$unk$","ori_empty":"","ori_null":null,"ori_list":["a","b"],"ori_dict":{"ori_a":0,"ori_b":1}}':
-	print("Error reemplazando distintos tipos de datos")
-	jdata.colprint(data, "Original")
-	jdata.colprint(repl, "Replaced")
-	exit(1)
-print("OK: Reemplazo de diferentes tipos de datos")
-
-# Comprobamos borrado de variables con reemplazo a null
-data={
-	"rep_str":"$str$",
-	"rep_num":"$num$",
-	"rep_list":"$list$",
-	"rep_dict":"$dict$",
-	"x_rep_null":"$null$",
-	"x_rep_empty":"$empty$",
-	"x_rep_unk":"$unk$",
-	"ori_empty":"",
-	"ori_null":None,
-	"ori_list": [ "a", "b" ],
-	"ori_dict": { "ori_a":0, "ori_b":1 },
-}
-repl=jdata.replacevars(data, {"str":"str", "num":1, "list":["a","b"], "dict":{"a":0,"b":1},"null":None,"empty":""}, flags=["nullremove","emptyremove", "unkremove"])
-#jdata.colprint(data, "Original")
-jdata.colprint(repl, "Replaced")
-
-exit(ret)

pydan-2.2/test/test-jdata.py

@@ -1,65 +0,0 @@
-#!/usr/bin/env python3
-
-from datetime import date,datetime,timezone,timedelta
-#import time
-import collections
-import re
-
-import sys
-sys.path.insert(1, '../src')
-import jdata
-
-# Some test dates
-utc=datetime(2020,8,20,10,20,30)
-utcoffset = round((datetime.now()-datetime.utcnow()).total_seconds())
-loc=utc+timedelta(seconds=utcoffset)
-unix=utc.timestamp()
-#utc=datetime.now(timezone.utc)
-#loc=datetime.now().replace(microsecond=0)
-#unix=utc.timestamp()
-
-# Test object creation
-data={}
-data["none"]=None
-data["str"]="String"
-data["bool"]=True
-data["num"]=42
-data["float"]=4.2
-data["date"]={"local":loc,"utc":utc,"unix":unix}
-data["list"]=["a1","a2","a3"]
-data["dict"]={"x":20,"y":22}
-data["complex"]=[{"var":"uno","val":1},{"var":"dos","val":2}]
-
-# Pretty print
-jdata.colprint(data, "data")
-
-# Convertimos a json
-jsonverify='{"none":null,"str":"String","bool":true,"num":42,"float":4.2,"date":{"local":"2020-08-20T12:20:30","utc":"2020-08-20T10:20:30","unix":1597911630.0},"list":["a1","a2","a3"],"dict":{"x":20,"y":22},"complex":[{"var":"uno","val":1},{"var":"dos","val":2}]}'
-json=jdata.tojson(data)
-if json!=jsonverify:
-	print("Error converting data to json!")
-	print("converted: "+json)
-	print("should be: "+jsonverify)
-	print
-	exit(1)
-jdata.colprint(json, "json")
-
-# Convertimos otra vez a dict
-data2=jdata.fromjson(json)
-if data!=data2:
-	print("Error converting json to data!")
-	exit(1)
-
-# Guardamos y leemos fichero json
-jdata.writejson(data,"test.json", tabs=1)
-data2=jdata.readjson("test.json")
-if data!=data2:
-	print("Error writing or reading json!")
-	exit(1)
-
-# Guardamos y leemos fichero yaml
-jdata.writeyaml(data,"test.yaml")
-data2=jdata.readyaml("test.yaml")
-if data!=data2:
-	print("Error writing or reading yaml!")
-	exit(1)