Merge pull request disqus#9 from vilhelmk/master

Rename session property from conduit to _conduit to avoid conflict.

Author: BYK

phabricator/__init__.py

@@ -241,7 +241,7 @@ def validate_kwarg(key, target):
                     raise ValueError('Wrong argument type: %s is not a list of %ss' % (key, val[0]))
                 raise ValueError('Wrong argument type: %s is not a %s' % (key, val))
 
-        conduit = self.api.conduit
+        conduit = self.api._conduit
 
         if conduit:
             # Already authenticated, add session key to json data
@@ -254,7 +254,7 @@ def validate_kwarg(key, target):
         else:
             # Authorization is required, silently auth the user
             self.api.connect()
-            kwargs['__conduit__'] = self.api.conduit
+            kwargs['__conduit__'] = self.api._conduit
 
         url = urlparse.urlparse(self.api.host)
         if url.scheme == 'https':
@@ -319,7 +319,7 @@ def __init__(self, username=None, certificate=None, host=None,
         self.client = 'python-phabricator'
         self.clientVersion = 1
         self.clientDescription = socket.gethostname() + ':python-phabricator'
-        self.conduit = None
+        self._conduit = None
 
         super(Phabricator, self).__init__(self)
 
@@ -338,7 +338,7 @@ def connect(self):
         response = auth(user=self.username, host=self.host,
                 client=self.client, clientVersion=self.clientVersion)
 
-        self.conduit = {
+        self._conduit = {
             'sessionKey': response.sessionKey,
             'connectionID': response.connectionID
         }