- elif isinstance(x, unicode):
- x = x.encode( 'utf-8' )
-
- if isinstance(x, types.StringType):
- x = "'%s'" % str(x).replace("\\", "\\\\").replace("'", "''")
- elif isinstance(x, (types.IntType, types.LongType, types.FloatType)):
+ elif isinstance(x, bytes):
+ x = x.decode('utf-8')
+
+ if isinstance(x, str):
+ # don't double quote backslahes, this causes failure
+ # with e.g. the SFA code when it tries to spot slices
+ # created from fed4fire, which to my knowledge is the only
+ # place where a backslash is useful
+ # x = x.replace("\\", "\\\\")
+ x = x.replace("'", "''")
+ x = f"'{x}'"
+ elif isinstance(x, (int, float)):