Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1eqtDI-0007UY-De for pgadmin-hackers@arkaria.postgresql.org; Wed, 28 Feb 2018 04:19:32 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1eqtDH-0004K6-8Y for pgadmin-hackers@arkaria.postgresql.org; Wed, 28 Feb 2018 04:19:31 +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 1eqtDG-0004Jv-Lr for pgadmin-hackers@lists.postgresql.org; Wed, 28 Feb 2018 04:19:31 +0000 Received: from mail-ot0-x232.google.com ([2607:f8b0:4003:c0f::232]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1eqtD9-0006Om-2W for pgadmin-hackers@postgresql.org; Wed, 28 Feb 2018 04:19:29 +0000 Received: by mail-ot0-x232.google.com with SMTP id 79so1048229oth.11 for ; Tue, 27 Feb 2018 20:19:22 -0800 (PST) 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=KNnVCTGjQATt+EPmwcJHti57z7IEQ2olevAxloS+Yb0=; b=JjJPLwZ/CDbZc6ldIjW4HNdNfrX9D4TCuj1pewDuTyJVy/hKuGez3xzUWwg51wFHSY pkMY/ffbGpLFjbtKxLkzeG6Ul75WJLoBC+ByjKe+UXyfDGSd9lj7/qpIkKkVetdgbOOy AYJ6c4jJBSQM95UjCGhW8FgwzzNmXUTYfcyyzvN7BfSxuLPkX0Pto2BXQpp/AijEAhfk 3YrBAilIRauj5evDSKG+H07vK9C42zuRs7+fYBMJLoFH04ghkio5HeRKtkVuJdZ6OPls V1euGyZ6LcDgyC1Sijal3P+BgvjqHEmYTrmNZIfBI1bgS5idGa2xNHiafbGaXZXR4Aow ICyw== 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=KNnVCTGjQATt+EPmwcJHti57z7IEQ2olevAxloS+Yb0=; b=UKxumwfc2piOfrFfKqrY8EUd1fl27cihriXeTYHsW3dFgmZo1P1mrYMYtretkaQ1Ra g0QqzRjRDCaEeU+eB0Vm5BaxHv2xW2tCTgq/PI2UzaJ/P1QQ2Vf40BlZqGuHYU48ORka rq9c/nDWJOZ6XkUvrWPUNpIX6bDML1tyo4Dcc7tzriqIwqtCUKgKvUOvKAOFTqUEirlr FI5k1049om25M7EtgowdIehCME7PrPBegCSZivdjAK4ty3iUuO4s0Fp3FnHAWO506mpp 7FQpjklFvzfbP9aaXjeVyGMcs8LShzRX4vvTVvHJNVNBk0WPc5mZ6b9JUzB9J3tfZ/7k rWGQ== X-Gm-Message-State: APf1xPDctsE5j3GqxU3XpAgeVLD93ppFukWy26V2lv4w2Mq97mxn7nB8 mV/fzpkQ9dUyXpD5mLDSV/9stZFM6cD/9r0ycg2O+g== X-Google-Smtp-Source: AG47ELsiYn05xahmEipA+Pxzq98B4hXrW4v+/gmszs3nUywqnA0iBcmJr4mDR7TAzIz0Rlwsm4GprbzmZoBc+YocvlE= X-Received: by 10.157.64.189 with SMTP id n58mr11155580ote.215.1519791561737; Tue, 27 Feb 2018 20:19:21 -0800 (PST) MIME-Version: 1.0 Received: by 10.74.203.154 with HTTP; Tue, 27 Feb 2018 20:19:21 -0800 (PST) In-Reply-To: References: From: Khushboo Vashi Date: Wed, 28 Feb 2018 09:49:21 +0530 Message-ID: Subject: Re: [pgAdmin4][Patch]: PEP-8 issue fixes To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="94eb2c1c0d902bcb5405663e0c58" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --94eb2c1c0d902bcb5405663e0c58 Content-Type: multipart/alternative; boundary="94eb2c1c0d902bcb5005663e0c56" --94eb2c1c0d902bcb5005663e0c56 Content-Type: text/plain; charset="UTF-8" On Mon, Feb 26, 2018 at 9:19 PM, Dave Page wrote: > Can you rebase this please? It doesn't apply against master. > > Please find the updated patch excluding utils module as it is already done. > On Mon, Feb 26, 2018 at 12:04 PM, Khushboo Vashi < > khushboo.vashi@enterprisedb.com> wrote: > >> Hi, >> >> Please find the attached patch to fix PEP-8 issues in the below modules: >> >> 1. about >> 2. feature_tests >> 3. misc >> 4. utils >> >> Thanks, >> Khushboo >> > > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --94eb2c1c0d902bcb5005663e0c56 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Feb 26, 2018 at 9:19 PM, Dave Page <dpage@pgadmin.org><= /span> wrote:
Can you re= base this please? It doesn't apply against master.

= Please find the updated patch excluding utils module as it is already done.= =C2=A0
=
On Mon, Feb 26, 2018 at 12:04 = PM, Khushboo Vashi <khushboo.vashi@enterprisedb.com= > wrote:
Hi,
Please find the attached patch to fix PEP-8 issues in the= below modules:

1. about
2. feature_test= s
3. misc
4. utils

Thanks,
Khushboo



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

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

--94eb2c1c0d902bcb5005663e0c56-- --94eb2c1c0d902bcb5405663e0c58 Content-Type: text/x-patch; charset="US-ASCII"; name="PEP8_fixes.patch" Content-Disposition: attachment; filename="PEP8_fixes.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_je6kelv40 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Fib3V0L19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4v YWJvdXQvX19pbml0X18ucHkKaW5kZXggOThhNGRkNi4uNmQxZTBiMiAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vYWJvdXQvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYWJvdXQvX19pbml0 X18ucHkKQEAgLTgsNyArOCw2IEBACiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogCiAiIiJBIGJsdWVwcmlu dCBtb2R1bGUgaW1wbGVtZW50aW5nIHRoZSBhYm91dCBib3guIiIiCi1NT0RVTEVfTkFNRSA9ICdh Ym91dCcKIAogaW1wb3J0IHN5cwogZnJvbSBmbGFzayBpbXBvcnQgUmVzcG9uc2UsIHJlbmRlcl90 ZW1wbGF0ZSwgX192ZXJzaW9uX18sIHVybF9mb3IKQEAgLTE4LDYgKzE3LDggQEAgZnJvbSBwZ2Fk bWluLnV0aWxzIGltcG9ydCBQZ0FkbWluTW9kdWxlCiBmcm9tIHBnYWRtaW4udXRpbHMubWVudSBp bXBvcnQgTWVudUl0ZW0KIGltcG9ydCBjb25maWcKIAorTU9EVUxFX05BTUUgPSAnYWJvdXQnCisK IAogY2xhc3MgQWJvdXRNb2R1bGUoUGdBZG1pbk1vZHVsZSk6CiAgICAgZGVmIGdldF9vd25fbWVu dWl0ZW1zKHNlbGYpOgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vZmVhdHVyZV90ZXN0cy9rZXli b2FyZF9zaG9ydGN1dF90ZXN0LnB5IGIvd2ViL3BnYWRtaW4vZmVhdHVyZV90ZXN0cy9rZXlib2Fy ZF9zaG9ydGN1dF90ZXN0LnB5CmluZGV4IGI4MzQ1N2MuLjQ0M2VmZjYgMTAwNjQ0Ci0tLSBhL3dl Yi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMva2V5Ym9hcmRfc2hvcnRjdXRfdGVzdC5weQorKysgYi93 ZWIvcGdhZG1pbi9mZWF0dXJlX3Rlc3RzL2tleWJvYXJkX3Nob3J0Y3V0X3Rlc3QucHkKQEAgLTY1 LDcgKzY1LDggQEAgY2xhc3MgS2V5Ym9hcmRTaG9ydGN1dEZlYXR1cmVUZXN0KEJhc2VGZWF0dXJl VGVzdCk6CiAgICAgICAgICAgICAgICAgS2V5cy5BTFQKICAgICAgICAgICAgICkucGVyZm9ybSgp CiAKLSAgICAgICAgICAgIHByaW50KCJFeGVjdXRpbmcgc2hvcnRjdXQ6ICIgKyBzZWxmLm5ld19z aG9ydGN1dHNbc11bJ2xvY2F0b3InXSArICIuLi4iLCBmaWxlPXN5cy5zdGRlcnIsIGVuZD0iIikK KyAgICAgICAgICAgIHByaW50KCJFeGVjdXRpbmcgc2hvcnRjdXQ6ICIgKyBzZWxmLm5ld19zaG9y dGN1dHNbc11bJ2xvY2F0b3InXSArCisgICAgICAgICAgICAgICAgICAiLi4uIiwgZmlsZT1zeXMu c3RkZXJyLCBlbmQ9IiIpCiAKICAgICAgICAgICAgIHNlbGYud2FpdC51bnRpbCgKICAgICAgICAg ICAgICAgICBFQy5wcmVzZW5jZV9vZl9lbGVtZW50X2xvY2F0ZWQoCmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9mZWF0dXJlX3Rlc3RzL3ZpZXdfZGF0YV9kbWxfcXVlcmllcy5weSBiL3dlYi9wZ2Fk bWluL2ZlYXR1cmVfdGVzdHMvdmlld19kYXRhX2RtbF9xdWVyaWVzLnB5CmluZGV4IGFhNzViNmUu LjEyZTQyOTUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMvdmlld19kYXRh X2RtbF9xdWVyaWVzLnB5CisrKyBiL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMvdmlld19kYXRh X2RtbF9xdWVyaWVzLnB5CkBAIC0xMDAsNyArMTAwLDcgQEAgQ1JFQVRFIFRBQkxFIHB1YmxpYy5k ZWZhdWx0c197MH0KICAgICAgICAgdGVzdF91dGlscy5jcmVhdGVfZGF0YWJhc2Uoc2VsZi5zZXJ2 ZXIsICJhY2NlcHRhbmNlX3Rlc3RfZGIiKQogCiAgICAgICAgICMgQ3JlYXRlIHByZS1yZXF1aXNp dGUgdGFibGUKLSAgICAgICAgZm9yIGssIHYgaW4geyAxOiAnaWQnLCAyOiciSUQiJyB9Lml0ZW1z KCk6CisgICAgICAgIGZvciBrLCB2IGluIHsxOiAnaWQnLCAyOiAnIklEIid9Lml0ZW1zKCk6CiAg ICAgICAgICAgICB0ZXN0X3V0aWxzLmNyZWF0ZV90YWJsZV93aXRoX3F1ZXJ5KAogICAgICAgICAg ICAgICAgIHNlbGYuc2VydmVyLAogICAgICAgICAgICAgICAgICJhY2NlcHRhbmNlX3Rlc3RfZGIi LApAQCAtMTE0LDcgKzExNCw3IEBAIENSRUFURSBUQUJMRSBwdWJsaWMuZGVmYXVsdHNfezB9CiAg ICAgICAgIHNlbGYucGFnZS5hZGRfc2VydmVyKHNlbGYuc2VydmVyKQogICAgICAgICBzZWxmLl90 YWJsZXNfbm9kZV9leHBhbmRhYmxlKCkKICAgICAgICAgIyBpdGVyYXRlIG9uIGJvdGggdGFibGVz Ci0gICAgICAgIGZvciBjbnQgaW4gKDEsMik6CisgICAgICAgIGZvciBjbnQgaW4gKDEsIDIpOgog ICAgICAgICAgICAgc2VsZi5wYWdlLnNlbGVjdF90cmVlX2l0ZW0oJ2RlZmF1bHRzX3swfScuZm9y bWF0KHN0cihjbnQpKSkKICAgICAgICAgICAgICMgT3BlbiBPYmplY3QgLT4gVmlldy9FZGl0IGRh dGEKICAgICAgICAgICAgIHNlbGYuX3ZpZXdfZGF0YV9ncmlkKCkKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5weSBiL3dlYi9wZ2FkbWluL21pc2MvYmdw cm9jZXNzL3Byb2Nlc3Nlcy5weQppbmRleCAwYzQxMTJhLi4wMmI5NTNkIDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9taXNjL2JncHJvY2Vzcy9wcm9jZXNzZXMucHkKKysrIGIvd2ViL3BnYWRtaW4v bWlzYy9iZ3Byb2Nlc3MvcHJvY2Vzc2VzLnB5CkBAIC0yMSwxMCArMjEsNiBAQCBmcm9tIHN1YnBy b2Nlc3MgaW1wb3J0IFBvcGVuCiAKIGZyb20gcGdhZG1pbi51dGlscyBpbXBvcnQgSVNfUFkyLCB1 LCBmaWxlX3F1b3RlLCBmc19lbmNvZGluZwogCi1pZiBJU19QWTI6Ci0gICAgZnJvbSBTdHJpbmdJ TyBpbXBvcnQgU3RyaW5nSU8KLWVsc2U6Ci0gICAgZnJvbSBpbyBpbXBvcnQgU3RyaW5nSU8KIGlt cG9ydCBweXR6CiBmcm9tIGRhdGV1dGlsIGltcG9ydCBwYXJzZXIKIGZyb20gZmxhc2sgaW1wb3J0 IGN1cnJlbnRfYXBwCkBAIC0zMyw2ICsyOSwxMCBAQCBmcm9tIGZsYXNrX3NlY3VyaXR5IGltcG9y dCBjdXJyZW50X3VzZXIKIAogaW1wb3J0IGNvbmZpZwogZnJvbSBwZ2FkbWluLm1vZGVsIGltcG9y dCBQcm9jZXNzLCBkYgoraWYgSVNfUFkyOgorICAgIGZyb20gU3RyaW5nSU8gaW1wb3J0IFN0cmlu Z0lPCitlbHNlOgorICAgIGZyb20gaW8gaW1wb3J0IFN0cmluZ0lPCiAKIAogZGVmIGdldF9jdXJy ZW50X3RpbWUoZm9ybWF0PSclWS0lbS0lZCAlSDolTTolUy4lZiAleicpOgpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vdXRpbHMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi91dGlscy9fX2luaXRf Xy5weQppbmRleCA2MzFlOTgxLi5jODdhMDQ1IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi91dGls cy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi91dGlscy9fX2luaXRfXy5weQpAQCAtNyw2 ICs3LDggQEAKICMKICMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCiAKK2ltcG9ydCBvcworaW1wb3J0IHN5cwog ZnJvbSBjb2xsZWN0aW9ucyBpbXBvcnQgZGVmYXVsdGRpY3QKIGZyb20gb3BlcmF0b3IgaW1wb3J0 IGF0dHJnZXR0ZXIKIApAQCAtMTUzLDkgKzE1NSw2IEBAIGNsYXNzIFBnQWRtaW5Nb2R1bGUoQmx1 ZXByaW50KToKICAgICAgICAgcmV0dXJuIHJlcwogCiAKLWltcG9ydCBvcwotaW1wb3J0IHN5cwot CiBJU19QWTIgPSAoc3lzLnZlcnNpb25faW5mb1swXSA9PSAyKQogSVNfV0lOID0gKG9zLm5hbWUg PT0gJ250JykKIApAQCAtMzE2LDQgKzMxNSwzIEBAIFNIT1JUQ1VUX0ZJRUxEUyA9IFsKICAgICAg ICAgJ2xhYmVsJzogZ2V0dGV4dCgnQWx0L09wdGlvbicpCiAgICAgfQogXQotCmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi91dGlscy9qYXZhc2NyaXB0L3Rlc3RzL3Rlc3RfamF2YXNjcmlwdF9idW5k bGVyLnB5IGIvd2ViL3BnYWRtaW4vdXRpbHMvamF2YXNjcmlwdC90ZXN0cy90ZXN0X2phdmFzY3Jp cHRfYnVuZGxlci5weQppbmRleCBmOTQ2Y2I4Li43MDMwNzAzIDEwMDY0NAotLS0gYS93ZWIvcGdh ZG1pbi91dGlscy9qYXZhc2NyaXB0L3Rlc3RzL3Rlc3RfamF2YXNjcmlwdF9idW5kbGVyLnB5Cisr KyBiL3dlYi9wZ2FkbWluL3V0aWxzL2phdmFzY3JpcHQvdGVzdHMvdGVzdF9qYXZhc2NyaXB0X2J1 bmRsZXIucHkKQEAgLTksMTYgKzksMTUgQEAKIAogCiBpbXBvcnQgc3lzCitmcm9tIHBnYWRtaW4u dXRpbHMucm91dGUgaW1wb3J0IEJhc2VUZXN0R2VuZXJhdG9yCitmcm9tIHBnYWRtaW4udXRpbHMu amF2YXNjcmlwdC5qYXZhc2NyaXB0X2J1bmRsZXIgaW1wb3J0IEphdmFzY3JpcHRCdW5kbGVyCitm cm9tIHBnYWRtaW4udXRpbHMuamF2YXNjcmlwdC5qYXZhc2NyaXB0X2J1bmRsZXIgaW1wb3J0IEpz U3RhdGUKIAogaWYgc3lzLnZlcnNpb25faW5mbyA8ICgzLCAzKToKICAgICBmcm9tIG1vY2sgaW1w b3J0IHBhdGNoCiBlbHNlOgogICAgIGZyb20gdW5pdHRlc3QubW9jayBpbXBvcnQgcGF0Y2gKIAot ZnJvbSBwZ2FkbWluLnV0aWxzLnJvdXRlIGltcG9ydCBCYXNlVGVzdEdlbmVyYXRvcgotZnJvbSBw Z2FkbWluLnV0aWxzLmphdmFzY3JpcHQuamF2YXNjcmlwdF9idW5kbGVyIGltcG9ydCBKYXZhc2Ny aXB0QnVuZGxlcgotZnJvbSBwZ2FkbWluLnV0aWxzLmphdmFzY3JpcHQuamF2YXNjcmlwdF9idW5k bGVyIGltcG9ydCBKc1N0YXRlCi0KIAogY2xhc3MgSmF2YXNjcmlwdEJ1bmRsZXJUZXN0Q2FzZShC YXNlVGVzdEdlbmVyYXRvcik6CiAgICAgIiIiVGhpcyB0ZXN0cyB0aGF0IHRoZSBqYXZhc2NyaXB0 IGJ1bmRsZXIgdG9vbCBjYXVzZXMgdGhlIGFwcGxpY2F0aW9uIHRvCmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi91dGlscy9yb3V0ZS5weSBiL3dlYi9wZ2FkbWluL3V0aWxzL3JvdXRlLnB5CmluZGV4 IDQxMDNlODcuLjM3OWVmNzUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3V0aWxzL3JvdXRlLnB5 CisrKyBiL3dlYi9wZ2FkbWluL3V0aWxzL3JvdXRlLnB5CkBAIC05LDE2ICs5LDE2IEBACiAKIGlt cG9ydCB0cmFjZWJhY2sKIGltcG9ydCBzeXMKLWlmIHN5cy52ZXJzaW9uX2luZm8gPCAoMiwgNyk6 Ci0gICAgaW1wb3J0IHVuaXR0ZXN0MiBhcyB1bml0dGVzdAotZWxzZToKLSAgICBpbXBvcnQgdW5p dHRlc3QKLQogZnJvbSBhYmMgaW1wb3J0IEFCQ01ldGEsIGFic3RyYWN0bWV0aG9kCiBmcm9tIGlt cG9ydGxpYiBpbXBvcnQgaW1wb3J0X21vZHVsZQogZnJvbSB3ZXJremV1Zy51dGlscyBpbXBvcnQg ZmluZF9tb2R1bGVzCi0KIGltcG9ydCBjb25maWcKK2ltcG9ydCBzaXgKKworaWYgc3lzLnZlcnNp b25faW5mbyA8ICgyLCA3KToKKyAgICBpbXBvcnQgdW5pdHRlc3QyIGFzIHVuaXR0ZXN0CitlbHNl OgorICAgIGltcG9ydCB1bml0dGVzdAogCiAKIGNsYXNzIFRlc3RzR2VuZXJhdG9yUmVnaXN0cnko QUJDTWV0YSk6CkBAIC03Niw5ICs3Niw2IEBAIGNsYXNzIFRlc3RzR2VuZXJhdG9yUmVnaXN0cnko QUJDTWV0YSk6CiAgICAgICAgICAgICAgICAgdHJhY2ViYWNrLnByaW50X2V4YyhmaWxlPXN5cy5z dGRlcnIpCiAKIAotaW1wb3J0IHNpeAotCi0KIEBzaXguYWRkX21ldGFjbGFzcyhUZXN0c0dlbmVy YXRvclJlZ2lzdHJ5KQogY2xhc3MgQmFzZVRlc3RHZW5lcmF0b3IodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICMgRGVmaW5pbmcgYWJzdHJhY3QgbWV0aG9kIHdoaWNoIHdpbGwgb3ZlcnJpZGUgYnkg aW5kaXZpZHVhbCB0ZXN0Y2FzZS4K --94eb2c1c0d902bcb5405663e0c58--