Merge pull request #23 from JasperWallace/master

allow using tokens with Socket

Author: tedivm

.gitignore

@@ -60,3 +60,6 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
+
+# backup files
+*~

screepsapi/screepsapi.py

@@ -259,7 +259,7 @@ def activate_ptr(self):
 
 class Socket(object):
 
-    def __init__(self, user, password, ptr=False, logging=False, host=None, secure=None):
+    def __init__(self, user, password, ptr=False, logging=False, host=None, secure=None, token=None):
         self.settings = {}
         self.user = user
         self.password = password
@@ -269,6 +269,7 @@ def __init__(self, user, password, ptr=False, logging=False, host=None, secure=N
         self.logging = False
         self.token = None
         self.user_id = None
+        self.atoken = token
 
     def on_error(self, ws, error):
         print (error)
@@ -360,7 +361,7 @@ def on_message(self, ws, message):
             self.process_rawdata(ws, data)
 
     def connect(self):
-        screepsConnection = API(u=self.user,p=self.password,ptr=self.ptr,host=self.host,secure=self.secure)
+        screepsConnection = API(u=self.user,p=self.password,ptr=self.ptr,host=self.host,secure=self.secure, token=self.atoken)
         me = screepsConnection.me()
         self.user_id = me['_id']
         self.token = screepsConnection.token

setup.py

@@ -8,7 +8,7 @@
     long_description = open('README.md').read()
 
 
-version = '0.5.0'
+version = '0.5.1'
 setup(
   name = 'screepsapi',
   version = version,