You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2023/04/13 19:11:07 UTC
[qpid-python] branch main updated (566dc21 -> 47a68f1)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-python.git
from 566dc21 QPID-8631: fix setup.py incompatible syntax for Python 3 (#17)
new d6fc95a QPID-8631: conditionally fill-in types removed in Python 3, so that setup.py runs
new 47a68f1 QPID-8631: use `next()` to progress the iterator in dom.py, so that setup.py runs
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
mllib/dom.py | 7 ++++++-
qpid/codec010.py | 15 +++++++++++++++
qpid/generator.py | 5 +++++
3 files changed, 26 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-python] 01/02: QPID-8631: conditionally fill-in types removed in Python 3, so that setup.py runs
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-python.git
commit d6fc95a972f72e4ea0152669c950775172c1ac7c
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Thu Apr 13 20:18:59 2023 +0200
QPID-8631: conditionally fill-in types removed in Python 3, so that setup.py runs
---
mllib/dom.py | 5 +++++
qpid/codec010.py | 15 +++++++++++++++
qpid/generator.py | 5 +++++
3 files changed, 25 insertions(+)
diff --git a/mllib/dom.py b/mllib/dom.py
index 916f814..4762087 100644
--- a/mllib/dom.py
+++ b/mllib/dom.py
@@ -28,6 +28,11 @@ from __future__ import nested_scopes
import mllib.transforms
+try:
+ basestring
+except NameError:
+ basestring = str
+
class Container:
def __init__(self):
diff --git a/qpid/codec010.py b/qpid/codec010.py
index bd6a3aa..8f9eee0 100644
--- a/qpid/codec010.py
+++ b/qpid/codec010.py
@@ -23,6 +23,21 @@ from .packer import Packer
from .datatypes import serial, timestamp, RangedSet, Struct, UUID
from .ops import Compound, PRIMITIVE, COMPOUND
+try:
+ buffer
+except NameError:
+ buffer = memoryview
+
+try:
+ long
+except NameError:
+ long = int
+
+try:
+ unicode
+except NameError:
+ unicode = str
+
class CodecException(Exception): pass
def direct(t):
diff --git a/qpid/generator.py b/qpid/generator.py
index 8fb602e..e52bb75 100644
--- a/qpid/generator.py
+++ b/qpid/generator.py
@@ -22,6 +22,11 @@ import sys
from .ops import *
+try:
+ basestring
+except NameError:
+ basestring = str
+
def METHOD(module, op):
method = lambda self, *args, **kwargs: self.invoke(op, args, kwargs)
if sys.version_info[:2] > (2, 3):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-python] 02/02: QPID-8631: use `next()` to progress the iterator in dom.py, so that setup.py runs
Posted by jd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-python.git
commit 47a68f1d44a6de4143dc2e86014425cee8d8aa1a
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Thu Apr 13 20:19:31 2023 +0200
QPID-8631: use `next()` to progress the iterator in dom.py, so that setup.py runs
---
mllib/dom.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mllib/dom.py b/mllib/dom.py
index 4762087..49ba0d0 100644
--- a/mllib/dom.py
+++ b/mllib/dom.py
@@ -244,7 +244,7 @@ class Flatten(View):
sources = [iter(self.source)]
while sources:
try:
- nd = sources[-1].next()
+ nd = next(sources[-1])
if isinstance(nd, Tree):
sources.append(iter(nd.children))
else:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org