Return-Path: Delivered-To: apmail-hadoop-avro-commits-archive@minotaur.apache.org Received: (qmail 31862 invoked from network); 7 Jul 2009 11:46:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jul 2009 11:46:02 -0000 Received: (qmail 21347 invoked by uid 500); 7 Jul 2009 11:46:12 -0000 Delivered-To: apmail-hadoop-avro-commits-archive@hadoop.apache.org Received: (qmail 21325 invoked by uid 500); 7 Jul 2009 11:46:12 -0000 Mailing-List: contact avro-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: avro-dev@hadoop.apache.org Delivered-To: mailing list avro-commits@hadoop.apache.org Received: (qmail 21315 invoked by uid 99); 7 Jul 2009 11:46:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2009 11:46:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 07 Jul 2009 11:46:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4FFAD23888CD; Tue, 7 Jul 2009 11:45:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r791801 - in /hadoop/avro/trunk: CHANGES.txt src/py/avro/genericio.py src/py/avro/io.py src/test/py/testipc.py Date: Tue, 07 Jul 2009 11:45:49 -0000 To: avro-commits@hadoop.apache.org From: sharad@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090707114549.4FFAD23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sharad Date: Tue Jul 7 11:45:48 2009 New Revision: 791801 URL: http://svn.apache.org/viewvc?rev=791801&view=rev Log: AVRO-64. Fix socket and parser issue on Mac OS. Modified: hadoop/avro/trunk/CHANGES.txt hadoop/avro/trunk/src/py/avro/genericio.py hadoop/avro/trunk/src/py/avro/io.py hadoop/avro/trunk/src/test/py/testipc.py Modified: hadoop/avro/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/CHANGES.txt?rev=791801&r1=791800&r2=791801&view=diff ============================================================================== --- hadoop/avro/trunk/CHANGES.txt (original) +++ hadoop/avro/trunk/CHANGES.txt Tue Jul 7 11:45:48 2009 @@ -139,3 +139,5 @@ AVRO-74. Add missing license headers in C++. (cutting) AVRO-73. Workaround in python to fix simplejson bug on Mac OS. (sharad) + + AVRO-64. Fix socket and parser issue on Mac OS. (sharad) Modified: hadoop/avro/trunk/src/py/avro/genericio.py URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/py/avro/genericio.py?rev=791801&r1=791800&r2=791801&view=diff ============================================================================== --- hadoop/avro/trunk/src/py/avro/genericio.py (original) +++ hadoop/avro/trunk/src/py/avro/genericio.py Tue Jul 7 11:45:48 2009 @@ -66,7 +66,7 @@ _validatefn = { schema.NULL : lambda schm, object: object is None, schema.BOOLEAN : lambda schm, object: isinstance(object, bool), - schema.STRING : lambda schm, object: isinstance(object, unicode), + schema.STRING : lambda schm, object: isinstance(object, basestring), schema.FLOAT : lambda schm, object: isinstance(object, float), schema.DOUBLE : lambda schm, object: isinstance(object, float), schema.BYTES : lambda schm, object: isinstance(object, str), Modified: hadoop/avro/trunk/src/py/avro/io.py URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/py/avro/io.py?rev=791801&r1=791800&r2=791801&view=diff ============================================================================== --- hadoop/avro/trunk/src/py/avro/io.py (original) +++ hadoop/avro/trunk/src/py/avro/io.py Tue Jul 7 11:45:48 2009 @@ -188,7 +188,7 @@ self.__writer.write(struct.pack(len(datum).__str__()+'s',datum)) def writeutf8(self, datum): - if not isinstance(datum, unicode): + if not isinstance(datum, basestring): raise AvroTypeException(schema.STRING, datum, "avro STRING should be python unicode") datum = datum.encode("utf-8") Modified: hadoop/avro/trunk/src/test/py/testipc.py URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/test/py/testipc.py?rev=791801&r1=791800&r2=791801&view=diff ============================================================================== --- hadoop/avro/trunk/src/test/py/testipc.py (original) +++ hadoop/avro/trunk/src/test/py/testipc.py Tue Jul 7 11:45:48 2009 @@ -104,4 +104,7 @@ def checkshutdown(self): if self.server is not None: - self.server.close() + try: + self.server.close() + except Exception, e: + print "Exception while closing socket", e