Merge branch 'SPARK-4586' of github.com:mengxr/spark into ml

Author: Davies Liu

python/pyspark/ml/feature.py

@@ -25,7 +25,8 @@
 @inherit_doc
 class Tokenizer(JavaTransformer, HasInputCol, HasOutputCol):
     """
-    A tokenizer that converts the input string to lowercase and then splits it by white spaces.
+    A tokenizer that converts the input string to lowercase and then
+    splits it by white spaces.
 
     >>> from pyspark.sql import Row
     >>> dataset = sqlCtx.inferSchema(sc.parallelize([Row(text="a b c")]))
@@ -44,7 +45,8 @@ class Tokenizer(JavaTransformer, HasInputCol, HasOutputCol):
 @inherit_doc
 class HashingTF(JavaTransformer, HasInputCol, HasOutputCol, HasNumFeatures):
     """
-    Maps a sequence of terms to their term frequencies using the hashing trick.
+    Maps a sequence of terms to their term frequencies using the
+    hashing trick.
 
     >>> from pyspark.sql import Row
     >>> dataset = sqlCtx.inferSchema(sc.parallelize([Row(words=["a", "b", "c"])]))