Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9D3BDEBED for ; Mon, 28 Jan 2013 20:37:00 +0000 (UTC) Received: (qmail 47266 invoked by uid 500); 28 Jan 2013 20:37:00 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 47198 invoked by uid 500); 28 Jan 2013 20:37:00 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 47190 invoked by uid 99); 28 Jan 2013 20:37:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 20:37:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 20:36:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7DB9B2388A40; Mon, 28 Jan 2013 20:36:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1439613 - in /qpid/proton/trunk: proton-c/bindings/python/proton.py tests/proton_tests/common.py Date: Mon, 28 Jan 2013 20:36:40 -0000 To: commits@qpid.apache.org From: kgiusti@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130128203640.7DB9B2388A40@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kgiusti Date: Mon Jan 28 20:36:40 2013 New Revision: 1439613 URL: http://svn.apache.org/viewvc?rev=1439613&view=rev Log: PROTON-199: compatibility with python 2.4 Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py qpid/proton/trunk/tests/proton_tests/common.py Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1439613&r1=1439612&r2=1439613&view=diff ============================================================================== --- qpid/proton/trunk/proton-c/bindings/python/proton.py (original) +++ qpid/proton/trunk/proton-c/bindings/python/proton.py Mon Jan 28 20:36:40 2013 @@ -32,6 +32,11 @@ The proton APIs consist of the following from cproton import * import uuid +try: + bytes() +except NameError: + bytes = str + LANGUAGE = "C" Modified: qpid/proton/trunk/tests/proton_tests/common.py URL: http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/common.py?rev=1439613&r1=1439612&r2=1439613&view=diff ============================================================================== --- qpid/proton/trunk/tests/proton_tests/common.py (original) +++ qpid/proton/trunk/tests/proton_tests/common.py Mon Jan 28 20:36:40 2013 @@ -36,8 +36,12 @@ class TestServer(object): def __init__(self, **kwargs): self.args = kwargs self.driver = Driver() - self.host = kwargs["host"] if "host" in kwargs else "127.0.0.1" - self.port = kwargs["port"] if "port" in kwargs else 0 + self.host = "127.0.0.1" + self.port = 0 + if "host" in kwargs: + self.host = kwargs["host"] + if "port" in kwargs: + self.port = kwargs["port"] self.driver_timeout = -1 self.credit_batch = 10 self.thread = Thread(name="server-thread", target=self.run) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org