breaking: make socket and event things private

Author: Tony Crisci

i3ipc/__init__.py

@@ -1,5 +1,5 @@
 from .model import (BarConfigReply, BarconfigUpdateEvent, BindingEvent, BindingInfo, CommandReply,
-                    ConfigReply, Event, Gaps, GenericEvent, MessageType, OutputReply, Rect,
-                    TickEvent, TickReply, VersionReply, WindowEvent, WorkspaceEvent, WorkspaceReply)
+                    ConfigReply, Gaps, GenericEvent, MessageType, OutputReply, Rect, TickEvent,
+                    TickReply, VersionReply, WindowEvent, WorkspaceEvent, WorkspaceReply)
 from .con import Con
 from .connection import Connection

i3ipc/connection.py

@@ -67,16 +67,20 @@ def __init__(self, socket_path=None, auto_reconnect=False):
 
         self._pubsub = PubSub(self)
         self.props = PropsObject(self)
-        self.socket_path = socket_path
+        self._socket_path = socket_path
         self._cmd_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        self._cmd_socket.connect(self.socket_path)
+        self._cmd_socket.connect(self._socket_path)
         self._cmd_lock = Lock()
         self._sub_socket = None
         self._sub_lock = Lock()
         self.auto_reconnect = auto_reconnect
         self._restarting = False
         self._quitting = False
 
+    @property
+    def socket_path(self):
+        return self._socket_path
+
     def _pack(self, msg_type, payload):
         """
         Packs the given message type and payload. Turns the resulting
@@ -141,7 +145,7 @@ def _wait_for_socket(self):
         # for the auto_reconnect feature only
         socket_path_exists = False
         for tries in range(0, 500):
-            socket_path_exists = os.path.exists(self.socket_path)
+            socket_path_exists = os.path.exists(self._socket_path)
             if socket_path_exists:
                 break
             time.sleep(0.001)
@@ -166,7 +170,7 @@ def message(self, message_type, payload):
                 raise e
 
             self._cmd_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            self._cmd_socket.connect(self.socket_path)
+            self._cmd_socket.connect(self._socket_path)
             return self._ipc_send(self._cmd_socket, message_type, payload)
         finally:
             self._cmd_lock.release()
@@ -350,7 +354,7 @@ def send_tick(self, payload=""):
         data = self.message(MessageType.SEND_TICK, payload)
         return json.loads(data, object_hook=TickReply)
 
-    def subscribe(self, events):
+    def _subscribe(self, events):
         events_obj = []
         if events & Event.WORKSPACE.value:
             events_obj.append("workspace")
@@ -420,9 +424,9 @@ def on(self, detailed_event, handler):
 
     def _event_socket_setup(self):
         self._sub_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        self._sub_socket.connect(self.socket_path)
+        self._sub_socket.connect(self._socket_path)
 
-        self.subscribe(self.subscriptions)
+        self._subscribe(self.subscriptions)
 
     def _event_socket_teardown(self):
         if self._sub_socket: