From d4fc9c4d4332f004d429b69b514345f30f026d58 Mon Sep 17 00:00:00 2001 From: Ai He Date: Mon, 29 Jun 2015 13:46:26 -0700 Subject: [PATCH] handle code review 2 1. remove exception of socket.error for keeping tracking of error outside 2. refactor for better readability --- python/pyspark/rdd.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/python/pyspark/rdd.py b/python/pyspark/rdd.py index 2364e25e8d8ed..a0f72fcb58cf2 100644 --- a/python/pyspark/rdd.py +++ b/python/pyspark/rdd.py @@ -134,17 +134,14 @@ def _load_from_socket(port, serializer): sock = None continue break - if sock: - try: - rf = sock.makefile("rb", 65536) - for item in serializer.load_stream(rf): - yield item - except socket.error: - raise Exception("encounter error when connecting to socket server") - finally: - sock.close() - else: + if not sock: raise Exception("could not open socket") + try: + rf = sock.makefile("rb", 65536) + for item in serializer.load_stream(rf): + yield item + finally: + sock.close() def ignore_unicode_prefix(f):