You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2017/03/11 20:11:21 UTC
[1/3] qpid-cpp git commit: QPID-7574: Make management libraries
Python 3 compatible
Repository: qpid-cpp
Updated Branches:
refs/heads/master 2ee9f79ed -> d2b80d401
QPID-7574: Make management libraries Python 3 compatible
With this change, qpid-cpp requires Python 2.7 or later.
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/4a5567d4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/4a5567d4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/4a5567d4
Branch: refs/heads/master
Commit: 4a5567d4351c72774b9dd6bb1e13fac6992cff75
Parents: 2ee9f79
Author: Justin Ross <jr...@apache.org>
Authored: Sat Mar 11 12:04:11 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Sat Mar 11 12:04:11 2017 -0800
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
management/python/lib/qmf/console.py | 51 +++++++++++++------------
management/python/lib/qpidtoollibs/disp.py | 10 +++--
3 files changed, 33 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/4a5567d4/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eefeafd..990c200 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ set(qpidc_version ${QPID_VERSION_FULL})
include(BuildInstallSettings.cmake)
-find_package(PythonInterp REQUIRED)
+find_package(PythonInterp 2.7 REQUIRED)
enable_testing()
include (CTest)
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/4a5567d4/management/python/lib/qmf/console.py
----------------------------------------------------------------------
diff --git a/management/python/lib/qmf/console.py b/management/python/lib/qmf/console.py
index 405c5dc..c8c1956 100644
--- a/management/python/lib/qmf/console.py
+++ b/management/python/lib/qmf/console.py
@@ -19,6 +19,8 @@
""" Console API for Qpid Management Framework """
+from __future__ import print_function
+
import os
import platform
import qpid
@@ -257,7 +259,7 @@ class Object(object):
result += u":"
try:
valstr = unicode(self._session._displayValue(value, prop.type))
- except Exception, e:
+ except Exception:
valstr = u"<undecodable>"
result += valstr
return result
@@ -1270,7 +1272,7 @@ class Session:
epoch = values['_epoch']
elif 'epoch' in values:
epoch = values['epoch']
- except Exception,e:
+ except Exception:
return
if self.agent_filter:
@@ -2447,7 +2449,7 @@ class Broker(Thread):
acquire_mode=self.amqpSession.acquire_mode.pre_acquired)
self.amqpSession.incoming("rdest").listen(self._v1Cb, self._exceptionCb)
self.amqpSession.message_set_flow_mode(destination="rdest", flow_mode=self.amqpSession.flow_mode.window)
- self.amqpSession.message_flow(destination="rdest", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFFL)
+ self.amqpSession.message_flow(destination="rdest", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFF)
self.amqpSession.message_flow(destination="rdest", unit=self.amqpSession.credit_unit.message, value=200)
self.topicName = "topic-%s" % self.amqpSessionId
@@ -2459,7 +2461,7 @@ class Broker(Thread):
acquire_mode=self.amqpSession.acquire_mode.pre_acquired)
self.amqpSession.incoming("tdest").listen(self._v1Cb, self._exceptionCb)
self.amqpSession.message_set_flow_mode(destination="tdest", flow_mode=self.amqpSession.flow_mode.window)
- self.amqpSession.message_flow(destination="tdest", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFFL)
+ self.amqpSession.message_flow(destination="tdest", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFF)
self.amqpSession.message_flow(destination="tdest", unit=self.amqpSession.credit_unit.message, value=200)
##
@@ -2505,7 +2507,7 @@ class Broker(Thread):
acquire_mode=self.amqpSession.acquire_mode.pre_acquired)
self.amqpSession.incoming("v2dest").listen(self._v2Cb, self._exceptionCb)
self.amqpSession.message_set_flow_mode(destination="v2dest", flow_mode=self.amqpSession.flow_mode.window)
- self.amqpSession.message_flow(destination="v2dest", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFFL)
+ self.amqpSession.message_flow(destination="v2dest", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFF)
self.amqpSession.message_flow(destination="v2dest", unit=self.amqpSession.credit_unit.message, value=50)
self.amqpSession.message_subscribe(queue=self.v2_topic_queue_ui, destination="v2TopicUI",
@@ -2513,7 +2515,7 @@ class Broker(Thread):
acquire_mode=self.amqpSession.acquire_mode.pre_acquired)
self.amqpSession.incoming("v2TopicUI").listen(self._v2Cb, self._exceptionCb)
self.amqpSession.message_set_flow_mode(destination="v2TopicUI", flow_mode=self.amqpSession.flow_mode.window)
- self.amqpSession.message_flow(destination="v2TopicUI", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFFL)
+ self.amqpSession.message_flow(destination="v2TopicUI", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFF)
self.amqpSession.message_flow(destination="v2TopicUI", unit=self.amqpSession.credit_unit.message, value=25)
@@ -2522,7 +2524,7 @@ class Broker(Thread):
acquire_mode=self.amqpSession.acquire_mode.pre_acquired)
self.amqpSession.incoming("v2TopicHB").listen(self._v2Cb, self._exceptionCb)
self.amqpSession.message_set_flow_mode(destination="v2TopicHB", flow_mode=self.amqpSession.flow_mode.window)
- self.amqpSession.message_flow(destination="v2TopicHB", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFFL)
+ self.amqpSession.message_flow(destination="v2TopicHB", unit=self.amqpSession.credit_unit.byte, value=0xFFFFFFFF)
self.amqpSession.message_flow(destination="v2TopicHB", unit=self.amqpSession.credit_unit.message, value=100)
codec = Codec()
@@ -2532,7 +2534,7 @@ class Broker(Thread):
return True # connection complete
- except Exception, e:
+ except Exception as e:
self.error = "Exception during connection setup: %s - %s" % (e.__class__.__name__, e)
self.conn_exc = e
if self.session.console:
@@ -2776,8 +2778,8 @@ class Broker(Thread):
def _v1Dispatch(self, msg):
try:
self._v1DispatchProtected(msg)
- except Exception, e:
- print "EXCEPTION in Broker._v1Cb:", e
+ except Exception as e:
+ print("EXCEPTION in Broker._v1Cb:", e)
import traceback
traceback.print_exc()
@@ -2850,8 +2852,8 @@ class Broker(Thread):
def _v2Dispatch(self, msg):
try:
self._v2DispatchProtected(msg)
- except Exception, e:
- print "EXCEPTION in Broker._v2Cb:", e
+ except Exception as e:
+ print("EXCEPTION in Broker._v2Cb:", e)
import traceback
traceback.print_exc()
@@ -4017,38 +4019,37 @@ class SequenceManager:
class DebugConsole(Console):
""" """
def brokerConnected(self, broker):
- print "brokerConnected:", broker
+ print("brokerConnected:", broker)
def brokerConnectionFailed(self, broker):
- print "brokerConnectionFailed:", broker
+ print("brokerConnectionFailed:", broker)
def brokerDisconnected(self, broker):
- print "brokerDisconnected:", broker
+ print("brokerDisconnected:", broker)
def newPackage(self, name):
- print "newPackage:", name
+ print("newPackage:", name)
def newClass(self, kind, classKey):
- print "newClass:", kind, classKey
+ print("newClass:", kind, classKey)
def newAgent(self, agent):
- print "newAgent:", agent
+ print("newAgent:", agent)
def delAgent(self, agent):
- print "delAgent:", agent
+ print("delAgent:", agent)
def objectProps(self, broker, record):
- print "objectProps:", record
+ print("objectProps:", record)
def objectStats(self, broker, record):
- print "objectStats:", record
+ print("objectStats:", record)
def event(self, broker, event):
- print "event:", event
+ print("event:", event)
def heartbeat(self, agent, timestamp):
- print "heartbeat:", agent
+ print("heartbeat:", agent)
def brokerInfo(self, broker):
- print "brokerInfo:", broker
-
+ print("brokerInfo:", broker)
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/4a5567d4/management/python/lib/qpidtoollibs/disp.py
----------------------------------------------------------------------
diff --git a/management/python/lib/qpidtoollibs/disp.py b/management/python/lib/qpidtoollibs/disp.py
index 1b7419b..a3f6cd5 100644
--- a/management/python/lib/qpidtoollibs/disp.py
+++ b/management/python/lib/qpidtoollibs/disp.py
@@ -19,6 +19,8 @@
# under the License.
#
+from __future__ import print_function
+
from time import strftime, gmtime
def YN(val):
@@ -158,7 +160,7 @@ class Display:
for idx in range(diff):
row.append("")
- print title
+ print(title)
if len (rows) == 0:
return
colWidth = []
@@ -179,12 +181,12 @@ class Display:
for i in range (colWidth[col] - len (head)):
line = line + " "
col = col + 1
- print line
+ print(line)
line = self.tablePrefix
for width in colWidth:
line = line + "=" * width
line = line[:255]
- print line
+ print(line)
for row in rows:
line = self.tablePrefix
@@ -198,7 +200,7 @@ class Display:
for i in range (width - len(unicode(text))):
line = line + " "
col = col + 1
- print line
+ print(line)
def do_setTimeFormat (self, fmt):
""" Select timestamp format """
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-cpp git commit: QPID-7698: Correct the qpid-python version
printed in the dependency check script
Posted by jr...@apache.org.
QPID-7698: Correct the qpid-python version printed in the dependency check script
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/8054f71c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/8054f71c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/8054f71c
Branch: refs/heads/master
Commit: 8054f71cedb29b88e43a5294a348a6a133e3a87c
Parents: 4a5567d
Author: Justin Ross <jr...@apache.org>
Authored: Sat Mar 11 12:08:42 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Sat Mar 11 12:08:42 2017 -0800
----------------------------------------------------------------------
src/tests/check_dependencies.py.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/8054f71c/src/tests/check_dependencies.py.in
----------------------------------------------------------------------
diff --git a/src/tests/check_dependencies.py.in b/src/tests/check_dependencies.py.in
index ef69fc1..57eb760 100755
--- a/src/tests/check_dependencies.py.in
+++ b/src/tests/check_dependencies.py.in
@@ -27,7 +27,7 @@ def _message(error):
===============================================================================
Error! {0}
-The tests require Qpid Python, version 1.33 or greater. Make sure
+The tests require Qpid Python, version 1.35.0 or greater. Make sure
Qpid Python is installed and available on the Python path:
- Linux distributions: Install 'python-qpid'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-cpp git commit: QPID-7698: Add yum instructions for RDMA
support; tidy up the related section
Posted by jr...@apache.org.
QPID-7698: Add yum instructions for RDMA support; tidy up the related section
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/d2b80d40
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/d2b80d40
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/d2b80d40
Branch: refs/heads/master
Commit: d2b80d40107b8ef29e51031dbc119017a15b1b6b
Parents: 8054f71
Author: Justin Ross <jr...@apache.org>
Authored: Sat Mar 11 12:10:24 2017 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Sat Mar 11 12:10:24 2017 -0800
----------------------------------------------------------------------
INSTALL.txt | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/d2b80d40/INSTALL.txt
----------------------------------------------------------------------
diff --git a/INSTALL.txt b/INSTALL.txt
index ab5fb1e..e1c4299 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -261,18 +261,25 @@ package management tool. For example on Fedora:
# yum install cmake boost-devel libuuid-devel pkgconfig gcc-c++ make ruby help2man doxygen graphviz
-For SASL and SSL, include
+For SASL and SSL, include:
+
# yum install cyrus-sasl-devel nss-devel nspr-devel
-For the XML Exchange, include:
+For the XML exchange, include:
# yum install xqilla-devel xerces-c-devel
-Optional ruby binding support include:
+For the RDMA transport, include:
+
+ # yum install libibverbs-devel librdmacm-devel
+
+For the Ruby binding, include:
+
# yum install ruby ruby-devel swig
-Optional legacystore store module.
-# yum install libdb-cxx-devel libaio-devel
+For the legacy store implementation, include:
+
+ # yum install libdb-cxx-devel libaio-devel
Follow the manual installation instruction below for any packages not
available through your distributions packaging tool.
@@ -324,4 +331,3 @@ Ensure that the boost libraries are made available on the gcc library path.
For example:
# export CXXFLAGS=-I~/qpid-tools/include/boost-1_33_1
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org