Received: from malur.postgresql.org ([2a02:16a8:dc51::56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1fTpC5-0004dp-Pn for pgadmin-hackers@arkaria.postgresql.org; Fri, 15 Jun 2018 13:55:14 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1fTpC4-0007q4-A8 for pgadmin-hackers@arkaria.postgresql.org; Fri, 15 Jun 2018 13:55:12 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1fTpC3-0007pu-TD for pgadmin-hackers@lists.postgresql.org; Fri, 15 Jun 2018 13:55:12 +0000 Received: from mail-oi0-x241.google.com ([2607:f8b0:4003:c06::241]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1fTpC0-0001pW-7L for pgadmin-hackers@postgresql.org; Fri, 15 Jun 2018 13:55:10 +0000 Received: by mail-oi0-x241.google.com with SMTP id k190-v6so8853206oib.9 for ; Fri, 15 Jun 2018 06:55:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=iW0xz9lvMMKmqsvTseE+WN+mXPJwB/mv81/aM6z+fkM=; b=MHKKE//NZUl2zde+tfVs3PQsxpfC+ou5jv2Qd8lrlfmjoWzcbUoFNWAfYXUW0fzCZk N4n70UIy+kBbw99R6qyVrXGI95KRhm4W7k23HA/OfZsJ9xOsqAae7KcfMVv4LGmf8+sd e3WXIBwDVPHPyo5vxNejEd1ZuF9IpEr/JWAd0tKSoDhQWkntsZ31lTk4cYeh53kxqack xm0DT20IMIX1YKD0yKPb8o7Tpro1Cspz9FGjhTzmU7POIjHHwOrpVFGy46uSxYYQDah9 V+l0c+/1x35dZcX5/fdMieKBhtkE9+cOC9qBy1UWprghAPdWqrN9AaI2U0rzt1t0TV3O tgmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=iW0xz9lvMMKmqsvTseE+WN+mXPJwB/mv81/aM6z+fkM=; b=uVACo8fSawRIrB2ZDg6YIvlwIkuvYMug4OLty+zxzKyRewjeGbnwIrCkxz+Lb5AG35 7rMDMvQ43wk7qzQSob6xmyAI5t3Mh83gjtDi94WBHrNTsgn+QY+qW4EH1GuyJIsHRYqC fvEB8F1KTuOB176sbfcjqODIwSzJHsSCd2S8kPLobHr4Ih1EnVF/DY5MgPAoz2T2oQv4 Ue3GopBi6s2aB0683HhVCatMRjR6g2rwgsESN6SzSeXMFT7zzMavWIwOkB9N5ZOKhvo6 8ro1TZrROlHMYt+UG0GHGLPW+dbfWvGGBp5L7gDdgaKaxjpqPvcn9+vei4i6U3A2oWGm icPg== X-Gm-Message-State: APt69E0Lu+xAa+zGxKs2S54oU716+eIYViy5QRDUcr7PvHKzYkdfjipD l8w6EYpSriaPf/j45JVSomRv3HDI9F6iaQOIsCNRrQ== X-Google-Smtp-Source: ADUXVKKCjuap14r2sqBMmd8Z/EJKIYm6fMDV19Mj4rFiNro5SZJyrX0DX9575z0QuWAfkn0Wsp/HBEaT3OZVBh7EG7s= X-Received: by 2002:aca:e290:: with SMTP id z138-v6mr985853oig.127.1529070906862; Fri, 15 Jun 2018 06:55:06 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a4a:4081:0:0:0:0:0 with HTTP; Fri, 15 Jun 2018 06:55:06 -0700 (PDT) In-Reply-To: References: From: Khushboo Vashi Date: Fri, 15 Jun 2018 19:25:06 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch] : Fix PG utilities with Python 2.6 To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000003db7b2056eae9086" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --0000000000003db7b2056eae9086 Content-Type: multipart/alternative; boundary="0000000000003db7af056eae9084" --0000000000003db7af056eae9084 Content-Type: text/plain; charset="UTF-8" Hi Dave, Please find the attached patch for PG utilities - PY 2.6. Thanks, Khushboo On Fri, Jun 15, 2018 at 5:08 PM, Dave Page wrote: > Thanks, applied. > > On Fri, Jun 15, 2018 at 12:27 PM, Khushboo Vashi < > khushboo.vashi@enterprisedb.com> wrote: > >> Hi, >> >> Please find the attached patch which fixes the PG utilities with python >> 2.6. >> >> Thanks, >> Khushboo >> > > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --0000000000003db7af056eae9084 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Dave,

Please find the attached= patch for PG utilities - PY 2.6.

Thanks,
Khus= hboo

O= n Fri, Jun 15, 2018 at 5:08 PM, Dave Page <dpage@pgadmin.org> wrote:
Thanks, applied= .

On Fri, Jun 15, 2018 at 12:27 PM, Khushboo Vashi <khushboo.vashi@enterprisedb.com> wrote:
Hi,

Please find th= e attached patch which fixes the PG utilities with python 2.6.
Thanks,
Khushboo



--
Dave Page
Blo= g: http://pgsnake= .blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
--0000000000003db7af056eae9084-- --0000000000003db7b2056eae9086 Content-Type: text/x-patch; charset="US-ASCII"; name="pg_utilities_fix_ver2.patch" Content-Disposition: attachment; filename="pg_utilities_fix_ver2.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jig1b3ic0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5weSBiL3dl Yi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5weQppbmRleCBjYjk4MjkxLi5jNjE1 MWUzIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9taXNjL2JncHJvY2Vzcy9wcm9jZXNzZXMucHkK KysrIGIvd2ViL3BnYWRtaW4vbWlzYy9iZ3Byb2Nlc3MvcHJvY2Vzc2VzLnB5CkBAIC00NjMsNyAr NDYzLDcgQEAgY2xhc3MgQmF0Y2hQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgc3Rp bWUgPSBwYXJzZXIucGFyc2Uoc2VsZi5zdGltZSkKICAgICAgICAgICAgICAgICBldGltZSA9IHBh cnNlci5wYXJzZShzZWxmLmV0aW1lIG9yIGdldF9jdXJyZW50X3RpbWUoKSkKIAotICAgICAgICAg ICAgICAgIGV4ZWN1dGlvbl90aW1lID0gKGV0aW1lIC0gc3RpbWUpLnRvdGFsX3NlY29uZHMoKQor ICAgICAgICAgICAgICAgIGV4ZWN1dGlvbl90aW1lID0gQmF0Y2hQcm9jZXNzLnRvdGFsX3NlY29u ZHMoZXRpbWUgLSBzdGltZSkKIAogICAgICAgICAgICAgaWYgcHJvY2Vzc19vdXRwdXQ6CiAgICAg ICAgICAgICAgICAgb3V0LCBvdXRfY29tcGxldGVkID0gcmVhZF9sb2coCkBAIC01NTgsNyArNTU4 LDcgQEAgY2xhc3MgQmF0Y2hQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgICAgICBzdGltZSA9IHBh cnNlci5wYXJzZShwLnN0YXJ0X3RpbWUpCiAgICAgICAgICAgICBldGltZSA9IHBhcnNlci5wYXJz ZShwLmVuZF90aW1lIG9yIGdldF9jdXJyZW50X3RpbWUoKSkKIAotICAgICAgICAgICAgZXhlY3V0 aW9uX3RpbWUgPSAoZXRpbWUgLSBzdGltZSkudG90YWxfc2Vjb25kcygpCisgICAgICAgICAgICBl eGVjdXRpb25fdGltZSA9IEJhdGNoUHJvY2Vzcy50b3RhbF9zZWNvbmRzKGV0aW1lIC0gc3RpbWUp CiAgICAgICAgICAgICBkZXNjID0gIiIKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAg ICBkZXNjID0gbG9hZHMocC5kZXNjLmVuY29kZSgnbGF0aW4tMScpKSBpZiBcCkBAIC02MDEsNiAr NjAxLDE2IEBAIGNsYXNzIEJhdGNoUHJvY2VzcyhvYmplY3QpOgogICAgICAgICByZXR1cm4gcmVz CiAKICAgICBAc3RhdGljbWV0aG9kCisgICAgZGVmIHRvdGFsX3NlY29uZHMoZHQpOgorICAgICAg ICAjIEtlZXAgYmFja3dhcmQgY29tcGF0aWJpbGl0eSB3aXRoIFB5dGhvbiAyLjYgd2hpY2ggZG9l c24ndCBoYXZlCisgICAgICAgICMgdGhpcyBtZXRob2QKKyAgICAgICAgaWYgaGFzYXR0cihkdCwg J3RvdGFsX3NlY29uZHMnKToKKyAgICAgICAgICAgIHJldHVybiBkdC50b3RhbF9zZWNvbmRzKCkK KyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHJldHVybiAoZHQubWljcm9zZWNvbmRzICsgKGR0 LnNlY29uZHMgKyBkdC5kYXlzICogMjQgKiAzNjAwKSAqCisgICAgICAgICAgICAgICAgICAgIDEw Kio2KSAvIDEwKio2CisKKyAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIGFja25vd2xlZGdlKF9w aWQpOgogICAgICAgICAiIiIKICAgICAgICAgQWNrbm93bGVkZ2UgZnJvbSB0aGUgdXNlciwgaGUv c2hlIGhhcyBhbHJlZHkgd2F0Y2hlZCB0aGUgc3RhdHVzLgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRt aW4vdG9vbHMvYmFja3VwL3Rlc3RzL3Rlc3RfYmF0Y2hfcHJvY2Vzcy5weSBiL3dlYi9wZ2FkbWlu L3Rvb2xzL2JhY2t1cC90ZXN0cy90ZXN0X2JhdGNoX3Byb2Nlc3MucHkKaW5kZXggYjAyMDgxOS4u MjUzNDJkNCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvYmFja3VwL3Rlc3RzL3Rlc3Rf YmF0Y2hfcHJvY2Vzcy5weQorKysgYi93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvdGVzdHMvdGVz dF9iYXRjaF9wcm9jZXNzLnB5CkBAIC0xMTksNyArMTE5LDEwIEBAIGNsYXNzIEJhdGNoUHJvY2Vz c1Rlc3QoQmFzZVRlc3RHZW5lcmF0b3IpOgogICAgICAgICBjdXJyZW50X2FwcF9tb2NrLlBHQURN SU5fUlVOVElNRSA9IEZhbHNlCiAKICAgICAgICAgZGVmIGRiX3Nlc3Npb25fYWRkX21vY2soaik6 Ci0gICAgICAgICAgICBjbWRfb2JqID0gbG9hZHMoai5kZXNjKQorICAgICAgICAgICAgaWYgc3lz LnZlcnNpb25faW5mbyA8ICgyLCA3KToKKyAgICAgICAgICAgICAgICBjbWRfb2JqID0gbG9hZHMo c3RyKGouZGVzYykpCisgICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGNtZF9vYmog PSBsb2FkcyhqLmRlc2MpCiAgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUoaXNpbnN0YW5jZShj bWRfb2JqLCBJUHJvY2Vzc0Rlc2MpKQogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjbWRf b2JqLmJhY2t1cF90eXBlLCBzZWxmLmNsYXNzX3BhcmFtc1sndHlwZSddKQogICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChjbWRfb2JqLmJmaWxlLCBzZWxmLmNsYXNzX3BhcmFtc1snYmZpbGUn XSkKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL3Rlc3RzL3Rlc3Rf YmF0Y2hfcHJvY2Vzc19tYWludGVuYW5jZS5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5h bmNlL3Rlc3RzL3Rlc3RfYmF0Y2hfcHJvY2Vzc19tYWludGVuYW5jZS5weQppbmRleCBmNzg1Yzg3 Li4zNzAwZDk2IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9tYWludGVuYW5jZS90ZXN0 cy90ZXN0X2JhdGNoX3Byb2Nlc3NfbWFpbnRlbmFuY2UucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9v bHMvbWFpbnRlbmFuY2UvdGVzdHMvdGVzdF9iYXRjaF9wcm9jZXNzX21haW50ZW5hbmNlLnB5CkBA IC03Myw3ICs3MywxMCBAQCBjbGFzcyBCYXRjaFByb2Nlc3NUZXN0KEJhc2VUZXN0R2VuZXJhdG9y KToKICAgICAgICAgICAgICAgICBzZWxmLnBvcnQgPSBwb3J0CiAKICAgICAgICAgZGVmIGRiX3Nl c3Npb25fYWRkX21vY2soaik6Ci0gICAgICAgICAgICBjbWRfb2JqID0gbG9hZHMoai5kZXNjKQor ICAgICAgICAgICAgaWYgc3lzLnZlcnNpb25faW5mbyA8ICgyLCA3KToKKyAgICAgICAgICAgICAg ICBjbWRfb2JqID0gbG9hZHMoc3RyKGouZGVzYykpCisgICAgICAgICAgICBlbHNlOgorICAgICAg ICAgICAgICAgIGNtZF9vYmogPSBsb2FkcyhqLmRlc2MpCiAgICAgICAgICAgICBzZWxmLmFzc2Vy dFRydWUoaXNpbnN0YW5jZShjbWRfb2JqLCBJUHJvY2Vzc0Rlc2MpKQogICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjbWRfb2JqLnF1ZXJ5LCBzZWxmLmNsYXNzX3BhcmFtc1snY21kJ10pCiAg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNtZF9vYmoubWVzc2FnZSwgc2VsZi5leHBlY3Rl ZF9tc2cpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9yZXN0b3JlL3Rlc3RzL3Rlc3Rf YmF0Y2hfcHJvY2Vzcy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL3Jlc3RvcmUvdGVzdHMvdGVzdF9i YXRjaF9wcm9jZXNzLnB5CmluZGV4IGVhMzNhZjIuLjhiYzVlZGUgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL3Rvb2xzL3Jlc3RvcmUvdGVzdHMvdGVzdF9iYXRjaF9wcm9jZXNzLnB5CisrKyBiL3dl Yi9wZ2FkbWluL3Rvb2xzL3Jlc3RvcmUvdGVzdHMvdGVzdF9iYXRjaF9wcm9jZXNzLnB5CkBAIC02 NCw3ICs2NCwxMCBAQCBjbGFzcyBCYXRjaFByb2Nlc3NUZXN0KEJhc2VUZXN0R2VuZXJhdG9yKToK ICAgICAgICAgY3VycmVudF9hcHBfbW9jay5QR0FETUlOX1JVTlRJTUUgPSBGYWxzZQogCiAgICAg ICAgIGRlZiBkYl9zZXNzaW9uX2FkZF9tb2NrKGopOgotICAgICAgICAgICAgY21kX29iaiA9IGxv YWRzKGouZGVzYykKKyAgICAgICAgICAgIGlmIHN5cy52ZXJzaW9uX2luZm8gPCAoMiwgNyk6Cisg ICAgICAgICAgICAgICAgY21kX29iaiA9IGxvYWRzKHN0cihqLmRlc2MpKQorICAgICAgICAgICAg ZWxzZToKKyAgICAgICAgICAgICAgICBjbWRfb2JqID0gbG9hZHMoai5kZXNjKQogICAgICAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKGlzaW5zdGFuY2UoY21kX29iaiwgSVByb2Nlc3NEZXNjKSkKICAg ICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY21kX29iai5iZmlsZSwgc2VsZi5jbGFzc19wYXJh bXNbJ2JmaWxlJ10pCiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNtZF9vYmouY21kLAo= --0000000000003db7b2056eae9086--