From f04882c9ad90b0af9cf0e1f8037e84df0c81f74f Mon Sep 17 00:00:00 2001
From: giwa <ugw.gi.world@gmail.com>
Date: Wed, 20 Aug 2014 18:54:22 -0700
Subject: [PATCH] clen up examples

---
 .../src/main/python/streaming/network_wordcount.py     |  8 +++-----
 examples/src/main/python/streaming/wordcount.py        | 10 +++-------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/examples/src/main/python/streaming/network_wordcount.py b/examples/src/main/python/streaming/network_wordcount.py
index 9b7af07803b4d..f242f8d29658a 100644
--- a/examples/src/main/python/streaming/network_wordcount.py
+++ b/examples/src/main/python/streaming/network_wordcount.py
@@ -1,7 +1,6 @@
 import sys
 from operator import add
 
-from pyspark.conf import SparkConf
 from pyspark.streaming.context import StreamingContext
 from pyspark.streaming.duration import *
 
@@ -9,15 +8,14 @@
     if len(sys.argv) != 3:
         print >> sys.stderr, "Usage: wordcount <hostname> <port>"
         exit(-1)
-    conf = SparkConf()
-    conf.setAppName("PythonStreamingNetworkWordCount")
-    ssc = StreamingContext(conf=conf, duration=Seconds(1))
+    ssc = StreamingContext(appName="PythonStreamingNetworkWordCount", 
+                           duration=Seconds(1))
 
     lines = ssc.socketTextStream(sys.argv[1], int(sys.argv[2]))
     words = lines.flatMap(lambda line: line.split(" "))
     mapped_words = words.map(lambda word: (word, 1))
     count = mapped_words.reduceByKey(add)
-
     count.pyprint()
+
     ssc.start()
     ssc.awaitTermination()
diff --git a/examples/src/main/python/streaming/wordcount.py b/examples/src/main/python/streaming/wordcount.py
index 2426345711086..e0600bbdb34d2 100644
--- a/examples/src/main/python/streaming/wordcount.py
+++ b/examples/src/main/python/streaming/wordcount.py
@@ -1,7 +1,5 @@
 import sys
-from operator import add
 
-from pyspark.conf import SparkConf
 from pyspark.streaming.context import StreamingContext
 from pyspark.streaming.duration import *
 
@@ -9,16 +7,14 @@
     if len(sys.argv) != 2:
         print >> sys.stderr, "Usage: wordcount <directory>"
         exit(-1)
-    conf = SparkConf()
-    conf.setAppName("PythonStreamingWordCount")
 
-    ssc = StreamingContext(conf=conf, duration=Seconds(1))
+    ssc = StreamingContext(appName="PythonStreamingWordCount", duration=Seconds(1))
 
     lines = ssc.textFileStream(sys.argv[1])
     words = lines.flatMap(lambda line: line.split(" "))
     mapped_words = words.map(lambda x: (x, 1))
-    count = mapped_words.reduceByKey(add)
-    
+    count = mapped_words.reduceByKey(lambda a, b: a+b)
     count.pyprint()
+
     ssc.start()
     ssc.awaitTermination()