zodbdump: Switch to using qq from pygolang

I originally added escapeqq as part of 75c03368 (zodbdump: Start to
stabilize output format) with the task for this utility to quote string
into valid "..." string always quoted with ".

This utility was later copied to pygolang:

	pygolang@afa46cf5

and then further improved there to work under both Python2 and Python3
and to not escape printable UTF-8 characters:

	pygolang@02dddb97

So stop the duplication and simply switch to the better version.

setup.py

@@ -19,7 +19,7 @@ setup(
     keywords    = 'zodb utility tool',
 
     packages    = find_packages(),
-    install_requires = ['ZODB', 'zodburi', 'six'],
+    install_requires = ['ZODB', 'zodburi', 'pygolang >= 0.0.0.dev3', 'six'],
 
     extras_require = {
                   'test': ['pytest'],

zodbtools/test/test_util.py

-# -*- coding: utf-8 -*-
-# Copyright (C) 2017  Nexedi SA and Contributors.
-#                     Kirill Smelkov <kirr@nexedi.com>
-#
-# This program is free software: you can Use, Study, Modify and Redistribute
-# it under the terms of the GNU General Public License version 3, or (at your
-# option) any later version, as published by the Free Software Foundation.
-#
-# You can also Link and Combine this program with other software covered by
-# the terms of any of the Free Software licenses or any of the Open Source
-# Initiative approved licenses and Convey the resulting work. Corresponding
-# source of such a combination shall include the source code for all other
-# software used.
-#
-# This program is distributed WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# See COPYING file for full licensing terms.
-# See https://www.nexedi.com/licensing for rationale and options.
-
-from zodbtools.util import escapeqq
-
-def test_escapeqq():
-    testv = (
-        # in            want without leading/trailing "
-        ('',            r""),
-        ('\'',          r"'"),
-        ('"',           r"\""),
-        ('abc\ndef',    r"abc\ndef"),
-        ('a\'c\ndef',   r"a'c\ndef"),
-        ('a\"c\ndef',   r"a\"c\ndef"),
-        # ('привет',      r"привет"),       TODO
-    )
-
-    for tin, twant in testv:
-        twant = '"' + twant + '"'   # add lead/trail "
-        assert escapeqq(tin) == twant

zodbtools/util.py

@@ -36,24 +36,6 @@ class Inf:
         return +1
 inf = Inf()
 
-# escapeqq escapes string into valid "..." string always quoted with ".
-#
-# (python's automatic escape uses smartquotes quoting with either ' or ")
-#
-# TODO also accept unicode as input.
-# TODO output printable UTF-8 characters as-is, but escape non-printable UTF-8 and invalid UTF-8 bytes.
-def escapeqq(s):
-    outv = []
-    # we don't want ' to be escaped
-    for _ in s.split("'"):
-        # this escape almost everything except " character
-        # NOTE string_escape does not do smartquotes and always uses ' for quoting
-        # (repr(str) is the same except it does smartquoting picking ' or " automatically)
-        q = _.encode("string_escape")
-        q = q.replace('"', r'\"')
-        outv.append(q)
-    return '"' + "'".join(outv) + '"'
-
 # get next item from iter -> (item, !stop)
 def nextitem(it):
     try:

zodbtools/zodbdump.py

@@ -54,13 +54,14 @@ TODO also protect txn record by hash.
 
 from __future__ import print_function
 from zodbtools.util import ashex, sha1, txnobjv, parse_tidrange, TidRangeInvalid,   \
-        storageFromURL, escapeqq
+        storageFromURL
 from ZODB._compat import loads, _protocol, BytesIO
 from zodbpickle.slowpickle import Pickler as pyPickler
 #import pickletools
 
 import sys
 import logging
+from golang.gcompat import qq
 
 # txn_raw_extension returns raw extension from txn metadata
 def txn_raw_extension(stor, txn):
@@ -97,10 +98,10 @@ def zodbdump(stor, tidmin, tidmax, hashonly=False, out=sys.stdout):
         # XXX .status not covered by IStorageTransactionInformation
         # XXX but covered by BaseStorage.TransactionRecord
         out.write("%stxn %s %s\nuser %s\ndescription %s\nextension %s\n" % (
-            vskip, ashex(txn.tid), escapeqq(txn.status),
-            escapeqq(txn.user),
-            escapeqq(txn.description),
-            escapeqq(txn_raw_extension(stor, txn)) ))
+            vskip, ashex(txn.tid), qq(txn.status),
+            qq(txn.user),
+            qq(txn.description),
+            qq(txn_raw_extension(stor, txn)) ))
 
         objv = txnobjv(txn)