From nobody Fri Mar 25 13:50:17 2022 X-Original-To: dev-commits-ports-all@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 6A4241A33FBA; Fri, 25 Mar 2022 13:50:19 +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 4KQ3Pk2Qxmz3R1N; Fri, 25 Mar 2022 13:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216219; 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=5wh60pZ4zum6AfIDOQk/ksuBOOZfcXh0+d0ksRS0C1Y=; b=J18Nux9Wafewuq8nKVQcbHZ6rjbP+RQSeKJTbc0qd6WVu03fvjDC/h9nlemt4Ou+6+N7GI /oCg5sv830SgB0V3MRfLJrgz+lAyDvzAksWHOCJvI0Uz6VVn5u1ewtCqLjqlgSIqQC572G 8q7Hd1a+ACHizAWd7GwvVqgsf+yHbbBc1erM15wlMmY7rmtmX2bCIE3r1pvJrJU7TqaGMV 4mSS2eo6kOQBXS7LfgIM+7GsJuCfSl55OkWot+xw2wV8iMYJJJceuHSxs2s2D27mlXzYgc /dmoXjmD2yCCdnX/IUU3oE6DzDTmmn8DU8wJ7dBJp6LhH4VjZp5zsjRJARPo1Q== 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 44CF858D1; Fri, 25 Mar 2022 13:50:17 +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 22PDoHIF034481; Fri, 25 Mar 2022 13:50:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDoH4O034473; Fri, 25 Mar 2022 13:50:17 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:17 GMT Message-Id: <202203251350.22PDoH4O034473@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: 4b3e03711be9 - main - devel/py-yapps2: Fix build with setuptools 58.0.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 4b3e03711be97f49eb95661d6c3852d09a3b170b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216219; 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=5wh60pZ4zum6AfIDOQk/ksuBOOZfcXh0+d0ksRS0C1Y=; b=jFJ4G3crwGMTxcJzjk+4wgDgOlOCG+QB0P6Lc7AvBU0mhdI3YpMoZ0DHRFt5eg8QSDbmDd oXBtAHJHT8sZ88QVPOBPP1ufTi0O2cs7S9grxMMCI5f1kwRNqPGWbM0YZjBMMS1deNePfD toC5mCIQgIk5aO8luX/hpfIXRafL1W1Eh2ayabqRqaaYH2wOIUGo2uOH99efvHayJOKY+F mRT8dGPF/MHA2NBzLD5lvdTh3zbOFjsy+PKd2As2WQnkk8erXwWjx3YbCBTsihL/z/JgqC Gl9qGO8GfYzsa7oJIUpd4VGL6MjKevmpkl61c2ltOKwRWJqadpAoYkiqXEEKqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216219; a=rsa-sha256; cv=none; b=brvWd+nz0GvbI9V4yjpkH1ubVxysn4Bj/P5nLiP6WSf0fyjxbd8S8WXq7ib128Ztagsbu0 HmXV2KVe8gyQqp7XYUBeY73hKvO/H3K++xTQMx001GFgLBmJ+v27FZGtfj0CvOeXwYhEcq 9ZIsEZ6iJ0DRX1EGznO+zA1lyiE130vMSNYsxt6ZNbFnlPHYIRRrY4sqMKlR1gymAqERCS PfZ9fQeZyELSex3JFvC0dEMf1gxmjNy4Bk4RedDNTtAmVqsegQrN/iZep37RgKM5ZjsLd2 JfmaIH8+us5CvAfuPNYJasyUJlhKAT6RGuQ8/VTZMiAcQ5ANmA3bOgjOsAqwUg== 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=4b3e03711be97f49eb95661d6c3852d09a3b170b commit 4b3e03711be97f49eb95661d6c3852d09a3b170b Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:26 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:13 +0000 devel/py-yapps2: Fix build with setuptools 58.0.0+ With hat: python --- devel/py-yapps2/files/patch-2to3 | 162 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/devel/py-yapps2/files/patch-2to3 b/devel/py-yapps2/files/patch-2to3 new file mode 100644 index 000000000000..bf8d6a1f79f3 --- /dev/null +++ b/devel/py-yapps2/files/patch-2to3 @@ -0,0 +1,162 @@ +--- lib/yapps/grammar.py.orig 2005-09-15 07:55:16 UTC ++++ lib/yapps/grammar.py +@@ -35,7 +35,7 @@ def resolve_name(rule, tokens, id, args): + if id in [x[0] for x in tokens]: + # It's a token + if args: +- print 'Warning: ignoring parameters on TOKEN %s<<%s>>' % (id, args) ++ print('Warning: ignoring parameters on TOKEN %s<<%s>>' % (id, args)) + return parsetree.Terminal(rule, id) + else: + # It's a name, so assume it's a nonterminal +--- lib/yapps/parsetree.py.orig 2005-09-15 07:55:40 UTC ++++ lib/yapps/parsetree.py +@@ -41,8 +41,8 @@ class Generator: + if n == '#ignore': + n = t + self.ignore.append(n) +- if n in self.tokens.keys() and self.tokens[n] != t: +- print >>sys.stderr, 'Warning: token %s defined more than once.' % n ++ if n in list(self.tokens.keys()) and self.tokens[n] != t: ++ print('Warning: token %s defined more than once.' % n, file=sys.stderr) + self.tokens[n] = t + self.terminals.append(n) + +@@ -236,20 +236,20 @@ class Generator: + """Display the grammar in somewhat human-readable form.""" + self.calculate() + for r in self.goals: +- print ' _____' + '_'*len(r) +- print ('___/Rule '+r+'\\' + '_'*80)[:79] ++ print(' _____' + '_'*len(r)) ++ print(('___/Rule '+r+'\\' + '_'*80)[:79]) + queue = [self.rules[r]] + while queue: + top = queue[0] + del queue[0] + +- print 'Rule', repr(top), 'of class', top.__class__.__name__ ++ print('Rule', repr(top), 'of class', top.__class__.__name__) + top.first.sort() + top.follow.sort() + eps = [] + if top.accepts_epsilon: eps = ['(null)'] +- print ' FIRST:', ', '.join(top.first+eps) +- print ' FOLLOW:', ', '.join(top.follow) ++ print(' FIRST:', ', '.join(top.first+eps)) ++ print(' FOLLOW:', ', '.join(top.follow)) + for x in top.get_children(): queue.append(x) + + def generate_output(self): +@@ -390,7 +390,7 @@ class NonTerminal(Node): + self.accepts_epsilon = self.target.accepts_epsilon + gen.changed() + except KeyError: # Oops, it's nonexistent +- print >>sys.stderr, 'Error: no rule <%s>' % self.name ++ print('Error: no rule <%s>' % self.name, file=sys.stderr) + self.target = self + + def __str__(self): +@@ -518,12 +518,12 @@ class Choice(Node): + tokens_seen = tokens_seen + testset + if removed: + if not testset: +- print >>sys.stderr, 'Error in rule', self.rule+':' ++ print('Error in rule', self.rule+':', file=sys.stderr) + else: +- print >>sys.stderr, 'Warning in rule', self.rule+':' +- print >>sys.stderr, ' *', self +- print >>sys.stderr, ' * These tokens could be matched by more than one clause:' +- print >>sys.stderr, ' *', ' '.join(removed) ++ print('Warning in rule', self.rule+':', file=sys.stderr) ++ print(' *', self, file=sys.stderr) ++ print(' * These tokens could be matched by more than one clause:', file=sys.stderr) ++ print(' *', ' '.join(removed), file=sys.stderr) + + if testset: + if not tokens_unseen: # context sensitive scanners only! +@@ -582,7 +582,7 @@ class Option(Wrapper): + + def output(self, gen, indent): + if self.child.accepts_epsilon: +- print >>sys.stderr, 'Warning in rule', self.rule+': contents may be empty.' ++ print('Warning in rule', self.rule+': contents may be empty.', file=sys.stderr) + gen.write(indent, "if %s:\n" % + gen.peek_test(self.first, self.child.first)) + self.child.output(gen, indent+INDENT) +@@ -604,8 +604,8 @@ class Plus(Wrapper): + + def output(self, gen, indent): + if self.child.accepts_epsilon: +- print >>sys.stderr, 'Warning in rule', self.rule+':' +- print >>sys.stderr, ' * The repeated pattern could be empty. The resulting parser may not work properly.' ++ print('Warning in rule', self.rule+':', file=sys.stderr) ++ print(' * The repeated pattern could be empty. The resulting parser may not work properly.', file=sys.stderr) + gen.write(indent, "while 1:\n") + self.child.output(gen, indent+INDENT) + union = self.first[:] +@@ -630,8 +630,8 @@ class Star(Wrapper): + + def output(self, gen, indent): + if self.child.accepts_epsilon: +- print >>sys.stderr, 'Warning in rule', self.rule+':' +- print >>sys.stderr, ' * The repeated pattern could be empty. The resulting parser probably will not work properly.' ++ print('Warning in rule', self.rule+':', file=sys.stderr) ++ print(' * The repeated pattern could be empty. The resulting parser probably will not work properly.', file=sys.stderr) + gen.write(indent, "while %s:\n" % + gen.peek_test(self.follow, self.child.first)) + self.child.output(gen, indent+INDENT) +--- lib/yapps/yapps_grammar.py.orig 2005-09-15 07:56:02 UTC ++++ lib/yapps/yapps_grammar.py +@@ -35,7 +35,7 @@ def resolve_name(rule, tokens, id, args): + if id in [x[0] for x in tokens]: + # It's a token + if args: +- print 'Warning: ignoring parameters on TOKEN %s<<%s>>' % (id, args) ++ print('Warning: ignoring parameters on TOKEN %s<<%s>>' % (id, args)) + return parsetree.Terminal(rule, id) + else: + # It's a name, so assume it's a nonterminal +--- lib/yapps/yappsrt.py.orig 2005-09-15 07:56:12 UTC ++++ lib/yapps/yappsrt.py +@@ -272,8 +272,8 @@ def print_line_with_pointer(text, p): + p = p - 7 + + # Now print the string, along with an indicator +- print >>sys.stderr, '> ',text +- print >>sys.stderr, '> ',' '*p + '^' ++ print('> ',text, file=sys.stderr) ++ print('> ',' '*p + '^', file=sys.stderr) + + def print_error(input, err, scanner): + """Print error messages, the parser stack, and the input text -- for human-readable error messages.""" +@@ -281,7 +281,7 @@ def print_error(input, err, scanner): + # Figure out the line number + line_number = scanner.get_line_number() + column_number = scanner.get_column_number() +- print >>sys.stderr, '%d:%d: %s' % (line_number, column_number, err.msg) ++ print('%d:%d: %s' % (line_number, column_number, err.msg), file=sys.stderr) + + context = err.context + if not context: +@@ -289,16 +289,16 @@ def print_error(input, err, scanner): + + while context: + # TODO: add line number +- print >>sys.stderr, 'while parsing %s%s:' % (context.rule, tuple(context.args)) ++ print('while parsing %s%s:' % (context.rule, tuple(context.args)), file=sys.stderr) + print_line_with_pointer(input, context.scanner.get_prev_char_pos(context.tokenpos)) + context = context.parent + + def wrap_error_reporter(parser, rule): + try: + return getattr(parser, rule)() +- except SyntaxError, e: ++ except SyntaxError as e: + input = parser._scanner.input + print_error(input, e, parser._scanner) + except NoMoreTokens: +- print >>sys.stderr, 'Could not complete parsing; stopped around here:' +- print >>sys.stderr, parser._scanner ++ print('Could not complete parsing; stopped around here:', file=sys.stderr) ++ print(parser._scanner, file=sys.stderr)