[MRG] Change deprecation warning for doc_topic_distr from future to present… (#8146)

garyForeman · jnothman · commit 581e13545fb5 · 2017-04-30T20:10:52.000+10:00
diff --git a/sklearn/decomposition/online_lda.py b/sklearn/decomposition/online_lda.py
@@ -756,8 +756,8 @@ def perplexity(self, X, doc_topic_distr='deprecated', sub_sampling=False):
         Perplexity is defined as exp(-1. * log-likelihood per word)
 
         .. versionchanged:: 0.19
-           *doc_topic_distr* argument has been depricated because user no
-           longer has access to unnormalized distribution
+           *doc_topic_distr* argument has been deprecated and is ignored
+           because user no longer has access to unnormalized distribution
 
         Parameters
         ----------
@@ -766,7 +766,7 @@ def perplexity(self, X, doc_topic_distr='deprecated', sub_sampling=False):
 
         doc_topic_distr : None or array, shape=(n_samples, n_topics)
             Document topic distribution.
-            If it is None, it will be generated by applying transform on X.
+            This argument is deprecated and is currently being ignored.
 
             .. deprecated:: 0.19
 
@@ -776,8 +776,9 @@ def perplexity(self, X, doc_topic_distr='deprecated', sub_sampling=False):
             Perplexity score.
         """
         if doc_topic_distr != 'deprecated':
-            warnings.warn("Argument 'doc_topic_distr' is deprecated and will "
-                          "be ignored as of 0.19. Support for this argument "
-                          "will be removed in 0.21.", DeprecationWarning)
+            warnings.warn("Argument 'doc_topic_distr' is deprecated and is "
+                          "being ignored as of 0.19. Support for this "
+                          "argument will be removed in 0.21.",
+                          DeprecationWarning)
 
         return self._perplexity_precomp_distr(X, sub_sampling=sub_sampling)
