fixup

python/pyspark/sql/classic/dataframe.py

@@ -1029,7 +1029,7 @@ def __getattr__(self, name: str) -> Column:
         return Column(jc)
 
     def __dir__(self) -> List[str]:
-        attrs = set(super().__dir__())
+        attrs = set(dir(DataFrame))
         attrs.update(filter(lambda s: s.isidentifier(), self.columns))
         return sorted(attrs)
 
@@ -1953,15 +1953,15 @@ def sampleBy(
 def _test() -> None:
     import doctest
     from pyspark.sql import SparkSession
-    import pyspark.sql.classic.dataframe
+    import pyspark.sql.dataframe
 
-    globs = pyspark.sql.classic.dataframe.__dict__.copy()
+    globs = pyspark.sql.dataframe.__dict__.copy()
     spark = (
         SparkSession.builder.master("local[4]").appName("sql.classic.dataframe tests").getOrCreate()
     )
     globs["spark"] = spark
     (failure_count, test_count) = doctest.testmod(
-        pyspark.sql.classic.dataframe,
+        pyspark.sql.dataframe,
         globs=globs,
         optionflags=doctest.ELLIPSIS | doctest.NORMALIZE_WHITESPACE | doctest.REPORT_NDIFF,
     )

python/pyspark/sql/connect/dataframe.py

@@ -1659,6 +1659,22 @@ def sampleBy(
             session=self._session,
         )
 
+    def _ipython_key_completions_(self) -> List[str]:
+        """Returns the names of columns in this :class:`DataFrame`.
+
+        Examples
+        --------
+        >>> df = spark.createDataFrame([(2, "Alice"), (5, "Bob")], ["age", "name"])
+        >>> df._ipython_key_completions_()
+        ['age', 'name']
+
+        Would return illegal identifiers.
+        >>> df = spark.createDataFrame([(2, "Alice"), (5, "Bob")], ["age 1", "name?1"])
+        >>> df._ipython_key_completions_()
+        ['age 1', 'name?1']
+        """
+        return self.columns
+
     def __getattr__(self, name: str) -> "Column":
         if name in ["_jseq", "_jdf", "_jmap", "_jcols", "rdd", "toJSON"]:
             raise PySparkAttributeError(
@@ -1738,7 +1754,7 @@ def _col(self, name: str) -> Column:
         )
 
     def __dir__(self) -> List[str]:
-        attrs = set(super().__dir__())
+        attrs = set(dir(DataFrame))
         attrs.update(self.columns)
         return sorted(attrs)
 
@@ -2149,11 +2165,16 @@ def _test() -> None:
     import sys
     import doctest
     from pyspark.sql import SparkSession as PySparkSession
-    import pyspark.sql.connect.dataframe
+    import pyspark.sql.dataframe
 
     os.chdir(os.environ["SPARK_HOME"])
 
-    globs = pyspark.sql.connect.dataframe.__dict__.copy()
+    globs = pyspark.sql.dataframe.__dict__.copy()
+
+    del pyspark.sql.dataframe.DataFrame.toJSON.__doc__
+    del pyspark.sql.dataframe.DataFrame.rdd.__doc__
+    del pyspark.sql.dataframe.DataFrame.checkpoint.__doc__
+    del pyspark.sql.dataframe.DataFrame.localCheckpoint.__doc__
 
     globs["spark"] = (
         PySparkSession.builder.appName("sql.connect.dataframe tests")
@@ -2162,7 +2183,7 @@ def _test() -> None:
     )
 
     (failure_count, test_count) = doctest.testmod(
-        pyspark.sql.connect.dataframe,
+        pyspark.sql.dataframe,
         globs=globs,
         optionflags=doctest.ELLIPSIS
         | doctest.NORMALIZE_WHITESPACE

python/pyspark/sql/dataframe.py

@@ -5295,7 +5295,7 @@ def _ipython_key_completions_(self) -> List[str]:
         >>> df._ipython_key_completions_()
         ['age 1', 'name?1']
         """
-        return self.columns
+        ...
 
     @dispatch_df_method
     def withColumns(self, *colsMap: Dict[str, Column]) -> "DataFrame":