Add support for specifying URL scheme.

Add support for specifying URL scheme (http|https).
Reorder class property definitions.
Adjust a couple of lines exceeding 80 characters.

Author: tnydwrds

ox3apiclient.py

@@ -17,6 +17,7 @@ class OX3APIClient(object):
 
     def __init__(self, domain, realm, consumer_key, consumer_secret,
                     callback_url='oob',
+                    scheme='http',
                     request_token_url=REQUEST_TOKEN_URL,
                     access_token_url=ACCESS_TOKEN_URL,
                     authorization_url=AUTHORIZATION_URL,
@@ -39,10 +40,11 @@ def __init__(self, domain, realm, consumer_key, consumer_secret,
         self.realm = realm
         self.consumer_key = consumer_key
         self.consumer_secret = consumer_secret
+        self.callback_url = callback_url
+        self.scheme=scheme
         self.request_token_url = request_token_url
         self.access_token_url = access_token_url
         self.authorization_url = authorization_url
-        self.callback_url = callback_url
         self.api_path = api_path
 
         # You shouldn't need to access the oauth2 consumer and token objects
@@ -53,7 +55,9 @@ def __init__(self, domain, realm, consumer_key, consumer_secret,
         # Similarly you probably won't need to access the cookie jar directly,
         # so it is private as well.
         self._cookie_jar = cookielib.LWPCookieJar()
-        opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(self._cookie_jar))
+        opener = \
+            urllib2.build_opener(urllib2.HTTPCookieProcessor(self._cookie_jar))
+        
         urllib2.install_opener(opener)
 
     def _sign_request(self, req):
@@ -86,7 +90,8 @@ def _sign_request(self, req):
         # Update or original requests headers to include the OAuth Authorization
         # header and return it.
         req.headers.update(oauth_req.to_header(realm=self.realm))
-        return urllib2.Request(req.get_full_url(), headers=req.headers, data=data)
+        return \
+            urllib2.Request(req.get_full_url(), headers=req.headers, data=data)
 
     def request(self, url, method='GET', headers={}, data=None, sign=False):
         """Helper method to make a (optionally OAuth signed) HTTP request."""
@@ -168,15 +173,19 @@ def validate_session(self):
 
         self._cookie_jar.set_cookie(cookie)
 
-        url = 'http://'+self.domain+self.api_path+'/a/session/validate'
+        url = '%s://%s%s/a/session/validate' % (self.scheme, 
+                                                self.domain,
+                                                self.api_path)
+        
         res = self.request(url=url, method='PUT')
         return res.read()
 
     def _resolve_url(self, url):
         """"""
         parse_res = urlparse.urlparse(url)
         if not parse_res.scheme:
-            url ='http://%s%s%s' % (self.domain, self.api_path, parse_res.path)
+            url ='%s://%s%s%s' % (self.scheme, self.domain, self.api_path,
+                                    parse_res.path)
 
         return url