[tor-commits] [stem/master] Return the previous behavior when socket was automatically connected

[atagar at torproject.org]

commit 74bb5df6edfdb92cf504b86c4d9253e4cc6a5c96
Author: Illia Volochii <illia.volochii at gmail.com>
Date:   Thu Apr 23 22:54:26 2020 +0300

    Return the previous behavior when socket was automatically connected
---
 stem/control.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/stem/control.py b/stem/control.py
index bd9e7d30..94b368de 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -3884,6 +3884,18 @@ class AsyncController(_ControllerClassMethodMixin, BaseController):
 
 
 class Controller(_ControllerClassMethodMixin, _BaseControllerSocketMixin):
+  @classmethod
+  def from_port(cls: Type, address: str = '127.0.0.1', port: Union[int, str] = 'default') -> 'stem.control.Controller':
+    instance = super().from_port(address, port)
+    instance.connect()
+    return instance
+
+  @classmethod
+  def from_socket_file(cls: Type, path: str = '/var/run/tor/control') -> 'stem.control.Controller':
+    instance = super().from_socket_file(path)
+    instance.connect()
+    return instance
+
   def __init__(self, control_socket: 'stem.socket.ControlSocket', is_authenticated: bool = False) -> None:
     self._asyncio_loop = asyncio.get_event_loop()