fix style

apache · May 12, 2015 · a163413 · a163413
1 parent 1042e80
commit a163413
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/python/pyspark/ml/param/__init__.py b/python/pyspark/ml/param/__init__.py
@@ -242,6 +242,6 @@ def _copyValues(self, to, extra={}):
         """
         paramMap = self.extractParamMap(extra)
         for p in self.params:
-            if paramMap.has_key(p) and to.hasParam(p.name):
+            if p in paramMap and to.hasParam(p.name):
                 to._set((p.name, paramMap[p]))
         return to
diff --git a/python/pyspark/ml/tests.py b/python/pyspark/ml/tests.py
@@ -74,7 +74,8 @@ def _fit(self, dataset):
         return model
 
 
-class MockModel(MockTransformer, Model, HasFake): pass
+class MockModel(MockTransformer, Model, HasFake):
+    pass
 
 
 class PipelineTests(PySparkTestCase):

diff --git a/python/pyspark/ml/tuning.py b/python/pyspark/ml/tuning.py
@@ -241,8 +241,7 @@ def copy(self, extra={}):
         newCV = Params.copy(self, extra)
         if self.isSet(self.estimator):
             newCV.setEstimator(self.getEstimator().copy(extra))
-        if self.isSet(self.estimatorParamMaps):
-            newCV.setEstimatorParamMaps(self.getEstimatorParamMaps().MAGIC_COPY_TO_BE_IMPLEMENTED(extra)) # TODO
+        # estimatorParamMaps remain the same
         if self.isSet(self.evaluator):
             newCV.setEvaluator(self.getEvaluator().copy(extra))
         return newCV