Fixed running from Pypi package

WesR · Oct 6, 2021 · c421840 · c421840
1 parent 7a69ea9
commit c421840
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = halcyon-matrix
-version = 1.0.1
+version = 1.0.2
 author = Wes Ring
 author_email = hello@wesring.com
 description = Halcyon is an easy to use matrix library

diff --git a/src/halcyon/__init__.py b/src/halcyon/__init__.py
@@ -1 +1,3 @@
-from .halcyon import *
+from .halcyon import *
+
+#from .restrunner import *
diff --git a/src/halcyon/halcyon.py b/src/halcyon/halcyon.py
@@ -74,7 +74,7 @@ def _init(self, halcyonToken=None, userID=None, password=None, homeserver=None):
                     accessToken = decodedToken["token"]
                     deviceID = decodedToken["device_id"]
 
-            self.restrunner = restrunner.Runner(homeserver=homeserver, user_id=userID, access_token=accessToken, device_id=deviceID)
+            self.restrunner = halcyon.restrunner.Runner(homeserver=homeserver, user_id=userID, access_token=accessToken, device_id=deviceID)
 
             resp = self.restrunner.whoami()
             if "errcode" not in resp:
@@ -84,7 +84,7 @@ def _init(self, halcyonToken=None, userID=None, password=None, homeserver=None):
 
         if userID and password:
             if homeserver:
-                self.restrunner = restrunner.Runner(homeserver=homeserver, user_id=userID)
+                self.restrunner = halcyon.restrunner.Runner(homeserver=homeserver, user_id=userID)
                 client._generateNewSessionToken(userID, password)
                 self.logoutOnDeath = True
                 #TODO: state.json file