Merge branch 'master' into kgiusti-python3
Conflicts:
tests/python/proton_tests/engine.py
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/43a61bb0
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/43a61bb0
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/43a61bb0
Branch: refs/heads/kgiusti-python3
Commit: 43a61bb0c051a15b19a5c7ca92bc873ea3e5ebfc
Parents: e7eb0c5 9272dea
Author: Ken Giusti <[email protected]>
Authored: Tue May 5 09:43:12 2015 -0400
Committer: Ken Giusti <[email protected]>
Committed: Tue May 5 09:43:12 2015 -0400
----------------------------------------------------------------------
CMakeLists.txt | 68 +++++----
bin/release.sh | 15 +-
bin/version.sh | 4 +-
contrib/proton-hawtdispatch/pom.xml | 2 +-
contrib/proton-jms/pom.xml | 2 +-
examples/java/messenger/pom.xml | 2 +-
examples/python/README | 6 +-
pom.xml | 2 +-
proton-c/CMakeLists.txt | 100 ++++++-------
proton-c/bindings/python/proton/__init__.py | 2 +-
.../bindings/ruby/lib/qpid_proton/mapping.rb | 4 +-
proton-c/include/proton/delivery.h | 11 +-
proton-c/include/proton/version.h.in | 1 +
proton-c/src/engine/engine.c | 10 +-
proton-c/src/object/map.c | 62 ++++++++-
proton-c/src/tests/object.c | 139 +++++++++++++++++++
proton-j/pom.xml | 2 +-
tests/pom.xml | 2 +-
tests/python/proton_tests/engine.py | 25 +++-
version.txt | 2 +-
20 files changed, 346 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/43a61bb0/proton-c/bindings/python/proton/__init__.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/43a61bb0/tests/python/proton_tests/engine.py
----------------------------------------------------------------------
diff --cc tests/python/proton_tests/engine.py
index c75bef9,05c8e19..06ea3f9
--- a/tests/python/proton_tests/engine.py
+++ b/tests/python/proton_tests/engine.py
@@@ -16,16 -16,15 +16,18 @@@
# specific language governing permissions and limitations
# under the License.
#
+from __future__ import absolute_import
-import os, common, gc
+import os, gc
+ import sys
+from . import common
from time import time, sleep
from proton import *
- from .common import pump
-from common import pump, Skipped
++from .common import pump, Skipped
from proton.reactor import Reactor
+from proton._compat import str2bin
+
# older versions of gc do not provide the garbage list
if not hasattr(gc, "garbage"):
gc.garbage=[]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
