style update

Author: mengxr

python/pyspark/ml/param/__init__.py

@@ -74,9 +74,9 @@ def _explain(self, param):
         param = self._resolveParam(param)
         values = []
         if self.isDefined(param):
-            if self.defaultParamMap.has_key(param):
+            if param in self.defaultParamMap:
                 values.append("default: %s" % self.defaultParamMap[param])
-            if self.paramMap.has_key(param):
+            if param in self.paramMap:
                 values.append("current: %s" % self.paramMap[param])
         else:
             values.append("undefined")
@@ -105,14 +105,14 @@ def isSet(self, param):
         Checks whether a param is explicitly set by user.
         """
         param = self._resolveParam(param)
-        return self.paramMap.has_key(param)
+        return param in self.paramMap
 
     def hasDefault(self, param):
         """
         Checks whether a param has a default value.
         """
         param = self._resolveParam(param)
-        return self.defaultParamMap.has_key(param)
+        return param in self.defaultParamMap
 
     def isDefined(self, param):
         """
@@ -126,7 +126,7 @@ def getOrDefault(self, param):
         default value. Raises an error if either is set.
         """
         if isinstance(param, Param):
-            if self.paramMap.has_key(param):
+            if param in self.paramMap:
                 return self.paramMap[param]
             else:
                 return self.defaultParamMap[param]

python/pyspark/ml/param/_shared_params_code_gen.py

@@ -35,6 +35,7 @@
 # Code generator for shared params (shared.py). Run under this folder with:
 # python _shared_params_code_gen.py > shared.py
 
+
 def _gen_param_code(name, doc, defaultValueStr):
     """
     Generates Python code for a shared param class.

python/pyspark/ml/tests.py

@@ -153,7 +153,8 @@ def test_params(self):
         with self.assertRaises(KeyError):
             testParams.getInputCol()
 
-        self.assertEquals(testParams.explainParams(),
+        self.assertEquals(
+            testParams.explainParams(),
             "\n".join(["inputCol: input column name (undefined)",
                        "maxIter: max number of iterations (default: 10, current: 100)"]))