X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPostgreSQL.py;h=dcf0608db17573537403ffd68d5d6d852aecff63;hb=e5831ff536668c94f108435395550f6339452ed6;hp=2368419da46eba00915bd875874a767a24c86266;hpb=2262dad38e7699a98c3df2a8c0de3ccf3d6e6373;p=plcapi.git diff --git a/PLC/PostgreSQL.py b/PLC/PostgreSQL.py index 2368419..dcf0608 100644 --- a/PLC/PostgreSQL.py +++ b/PLC/PostgreSQL.py @@ -60,14 +60,16 @@ class PostgreSQL: @staticmethod # From pgdb, and simplify code + # this is **very different** from the python2 code ! def _quote(x): if isinstance(x, DateTimeType): x = str(x) - elif isinstance(x, str): - x = x.encode('utf-8') + elif isinstance(x, bytes): + x = x.decode('utf-8') - if isinstance(x, bytes): - x = "'%s'" % str(x).replace("\\", "\\\\").replace("'", "''") + if isinstance(x, str): + x = x.replace("\\", "\\\\").replace("'", "''") + x = f"'{x}'" elif isinstance(x, (int, float)): pass elif x is None: