From nobody Sun Jan 23 19:27:46 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 39E25196B7D9; Sun, 23 Jan 2022 19:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JhjnK2K9kz3MrB; Sun, 23 Jan 2022 19:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642966069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jk2aOCN+tmYZ5K3TDdO32itkBH7fhxbAmuupSiAHvd8=; b=V1552bUeMEO/MqDi6Z8MfiY+pnttLhptHTcuf0Ksu/AlaeaoGoLzd11LMNpUZUYrdr0lx0 GtlDl4/6r/1TgXflapAdS3Br7EsfQdRd867jjOGEvk2B781kwit9ZNHnsvyHn0R/QvRYNG h427TGs9bG5SVQMFoMVVMhvanNlmlewOQ/gW9jXYfa6BEY1FCspNW+qDrA1cIK9sYIFqwQ ULnE4X1RWL58x6fypAkO1m6m5lXZetUU9/LPCAkVBfiAHRA/FcjfV27JJGKIoALE+P4p2S vSGEMSAeGTAcTNKhpulYRK2+6vFkeFgjTQHlqGuIX9MA+HWFPrDDOGUG3IiscQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B87D49A; Sun, 23 Jan 2022 19:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20NJRkc8015076; Sun, 23 Jan 2022 19:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NJRk9u015075; Sun, 23 Jan 2022 19:27:46 GMT (envelope-from git) Date: Sun, 23 Jan 2022 19:27:46 GMT Message-Id: <202201231927.20NJRk9u015075@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: a6c915db400c - main - devel/py-debugpy: Update patch to avoid build error List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6c915db400cfca1cd88e9b5325636d1384f9956 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642966069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jk2aOCN+tmYZ5K3TDdO32itkBH7fhxbAmuupSiAHvd8=; b=B5EU9YK+tiPilyGZ2pbiA6UX6OmrfSLi1MovIKGQWWEMopR8z3KM7WCArUsYJ3bkvPqxkZ TeRkXs+xBH/xNnhXuqhhLgIeW0O6O2nys14Kd8kp6SHWv4UcXBT3EWkmC8NT5EuAxD0W45 bMYMoSGOFmKfXXghA1bwtnSj6CgGM97VwcHYsMNwAN4s/FGE769MpkHcxi7vWdtDG/aeNJ 7U82htjcJn3KipXGZ+/ykMPSHuyv9lME6438BW85KHjtojjZ+FViOCBtJJGm74BgIpBPmN 7vuLwm81vTe64Hb4Fnj/VuSrzwVmRWyHR9CfkBKsIdlLlLLw2w47y2PHXGzMrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642966069; a=rsa-sha256; cv=none; b=VF1mtu3l/UFXSjWdxoZ9yiw+IrwockBe9zT5gLP+cULCp4eg0pMreXlBffzjxcJiNAqpYR 0lfg1VWtdkJgGpLz8bS9fuf3VjKR9kBcdBkvU5Bt5En6qWmf6x1lZ4S2jVjfndTGM9gJ3k 3c4MuJK+H640I3nRmVthEkusy3yvUu1l2LMpgCJqbFvZ20qV9A/BqPByBGLAW/5kZq8HXW WOTWm257eK2X01GbUa0JR/4EkRCjLkw8u45/BpNbzdJLQG4iPRbK71HrZjcUdznhoDqhWW Ck3AuEDK5kk2MHahmsnNAu8qsgDGBKw20WLgyTA/GbP8GHSN2rhKNTehfo8e5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6c915db400cfca1cd88e9b5325636d1384f9956 commit a6c915db400cfca1cd88e9b5325636d1384f9956 Author: Po-Chuan Hsieh AuthorDate: 2022-01-23 18:19:19 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-01-23 18:19:19 +0000 devel/py-debugpy: Update patch to avoid build error --- ...vendored-pydevd-_pydev_imps-_pydev_xmlrpclib.py | 38 ++++++++++++++-------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/devel/py-debugpy/files/patch-src-debugpy-_vendored-pydevd-_pydev_imps-_pydev_xmlrpclib.py b/devel/py-debugpy/files/patch-src-debugpy-_vendored-pydevd-_pydev_imps-_pydev_xmlrpclib.py index e923b44a4e37..0213996d39b8 100644 --- a/devel/py-debugpy/files/patch-src-debugpy-_vendored-pydevd-_pydev_imps-_pydev_xmlrpclib.py +++ b/devel/py-debugpy/files/patch-src-debugpy-_vendored-pydevd-_pydev_imps-_pydev_xmlrpclib.py @@ -1,4 +1,4 @@ ---- src/debugpy/_vendored/pydevd/_pydev_imps/_pydev_xmlrpclib.py.orig 2021-09-26 20:08:06 UTC +--- src/debugpy/_vendored/pydevd/_pydev_imps/_pydev_xmlrpclib.py.orig 2022-01-15 23:38:41 UTC +++ src/debugpy/_vendored/pydevd/_pydev_imps/_pydev_xmlrpclib.py @@ -146,9 +146,9 @@ from types import * # Internal stuff @@ -47,7 +47,15 @@ # -------------------------------------------------------------------- # Error constants (from Dan Libby's specification at -@@ -319,7 +319,7 @@ else: +@@ -291,7 +291,6 @@ class Fault(Error): + if _bool_is_builtin: + boolean = Boolean = bool #@UndefinedVariable + # to avoid breaking code which references xmlrpclib.{True,False} +- True, False = True, False + else: + class Boolean: + """Boolean-value wrapper. +@@ -319,11 +318,9 @@ else: def __int__(self): return self.value @@ -55,8 +63,12 @@ + def __bool__(self): return self.value - True, False = Boolean(1), Boolean(0) -@@ -420,9 +420,9 @@ def _datetime_type(data): +- True, False = Boolean(1), Boolean(0) +- + ## + # Map true or false value to XML-RPC boolean values. + # +@@ -420,9 +417,9 @@ def _datetime_type(data): import base64 try: @@ -68,7 +80,7 @@ class Binary: """Wrapper for binary data.""" -@@ -448,7 +448,7 @@ class Binary: +@@ -448,7 +445,7 @@ class Binary: def encode(self, out): out.write("\n") @@ -77,7 +89,7 @@ out.write("\n") def _binary(data): -@@ -682,7 +682,7 @@ class Marshaller: +@@ -682,7 +679,7 @@ class Marshaller: write("\n") dispatch[StringType] = dump_string @@ -86,7 +98,7 @@ def dump_unicode(self, value, write, escape=escape): value = value.encode(self.encoding) write("") -@@ -692,7 +692,7 @@ class Marshaller: +@@ -692,7 +689,7 @@ class Marshaller: def dump_array(self, value, write): i = id(value) @@ -95,7 +107,7 @@ raise TypeError("cannot marshal recursive sequences") self.memo[i] = None dump = self.__dump -@@ -706,15 +706,15 @@ class Marshaller: +@@ -706,15 +703,15 @@ class Marshaller: def dump_struct(self, value, write, escape=escape): i = id(value) @@ -114,7 +126,7 @@ k = k.encode(self.encoding) else: raise TypeError("dictionary key must be string") -@@ -1230,12 +1230,12 @@ class Transport: +@@ -1230,12 +1227,12 @@ class Transport: if isinstance(host, TupleType): host, x509 = host @@ -130,7 +142,7 @@ auth = string.join(string.split(auth), "") # get rid of whitespace extra_headers = [ ("Authorization", "Basic " + auth) -@@ -1253,9 +1253,9 @@ class Transport: +@@ -1253,9 +1250,9 @@ class Transport: def make_connection(self, host): # create a HTTP connection object from a host descriptor @@ -142,7 +154,7 @@ ## # Send request header. -@@ -1278,7 +1278,7 @@ class Transport: +@@ -1278,7 +1275,7 @@ class Transport: connection.putheader("Host", host) if extra_headers: if isinstance(extra_headers, DictType): @@ -151,7 +163,7 @@ for key, value in extra_headers: connection.putheader(key, value) -@@ -1355,10 +1355,10 @@ class SafeTransport(Transport): +@@ -1355,10 +1352,10 @@ class SafeTransport(Transport): def make_connection(self, host): # create a HTTPS connection object from a host descriptor # host may be a string, or a (host, x509-dict) tuple @@ -164,7 +176,7 @@ except AttributeError: raise NotImplementedError( "your version of httplib doesn't support HTTPS" -@@ -1410,11 +1410,11 @@ class ServerProxy: +@@ -1410,11 +1407,11 @@ class ServerProxy: # establish a "logical" server connection # get the url