revert: rename query printer methods

Signed-off-by: Gabor Boros <[email protected]>

Author: gabor-boros

CHANGELOG.rst

@@ -53,8 +53,6 @@ API and behavior changes (including breaking changes) compared to 2.4.x:
   * `ReqlAuthError` raises `ValueError` if only host or only port is provided; includes host:port in message if both are provided
   * `ReqlTimeoutError` now subclasses `TimeoutError` and mirrors `ReqlAuthError` host/port validation and messaging
 * **QueryPrinter (errors.QueryPrinter)**:
-  * `print_query` -> property `query`
-  * `print_carrots` -> property `carets`
   * Error messages now embed composed query and caret markers
 * **Handshake (`rethinkdb.handshake.HandshakeV1_0`)**:
   * Uses protected attributes for credentials: `__username`, `__password`

rethinkdb/ast.py

@@ -90,7 +90,7 @@ def __str__(self) -> str:
         """
         Return the string representation of the query.
         """
-        return QueryPrinter(self).query
+        return QueryPrinter(self).print_query()
 
     def __repr__(self) -> str:
         """

rethinkdb/errors.py

@@ -58,16 +58,14 @@ def __init__(self, root: "RqlQuery", frames: Optional[List[int]] = None) -> None
         self.root = root
         self.frames: List[int] = frames or []
 
-    @property
-    def query(self) -> str:
+    def print_query(self) -> str:
         """
         Return the composed query.
         """
 
         return "".join(self.__compose_term(self.root))
 
-    @property
-    def carets(self) -> str:
+    def print_carrots(self) -> str:
         """
         Return the carets indicating the location of the failure for the query.
         """
@@ -152,7 +150,7 @@ def __str__(self) -> str:
             return self.message
 
         message = self.message.rstrip(".")
-        return f"{message} in:\n{self.__query_printer.query}\n{self.__query_printer.carets}"
+        return f"{message} in:\n{self.__query_printer.print_query()}\n{self.__query_printer.print_carrots()}"
 
     def __repr__(self) -> str:
         """