Initial conversion to logging.

JNRowe · JNRowe · commit 552a62d15100 · 2011-06-11T08:52:29.000+01:00
diff --git a/github2/client.py b/github2/client.py
@@ -10,9 +10,9 @@
 
 class Github(object):
 
-    def __init__(self, username=None, api_token=None, debug=False,
-        requests_per_second=None, access_token=None, cache=None,
-        proxy_host=None, proxy_port=8080):
+    def __init__(self, username=None, api_token=None, requests_per_second=None,
+                 access_token=None, cache=None, proxy_host=None,
+                 proxy_port=8080):
         """
         An interface to GitHub's API:
             http://develop.github.com/
@@ -27,7 +27,6 @@ def __init__(self, username=None, api_token=None, debug=False,
         :param str username: your own GitHub username.
         :param str api_token: can be found at https://github.com/account
             (while logged in as that user):
-        :param bool debug: enable debugging information.
         :param str access_token: can be used when no ``username`` and/or
             ``api_token`` is used.  The ``access_token`` is the OAuth access
             token that is received after successful OAuth authentication.
@@ -41,9 +40,7 @@ def __init__(self, username=None, api_token=None, debug=False,
             default to 8080 if a proxy_host is set and no port is set).
         """
 
-        self.debug = debug
         self.request = GithubRequest(username=username, api_token=api_token,
-                                     debug=self.debug,
                                      requests_per_second=requests_per_second,
                                      access_token=access_token, cache=cache,
                                      proxy_host=proxy_host,
diff --git a/github2/request.py b/github2/request.py
@@ -1,4 +1,5 @@
 import datetime
+import logging
 import re
 import sys
 import time
@@ -22,6 +23,9 @@
 #: Hostname for API access
 GITHUB_URL = "https://github.com"
 
+#: Logger for requests module
+LOGGER = logging.getLogger('github2.request')
+
 
 def charset_from_headers(headers):
     """Parse charset from headers
@@ -49,8 +53,8 @@ class GithubRequest(object):
     GithubError = GithubError
 
     def __init__(self, username=None, api_token=None, url_prefix=None,
-            debug=False, requests_per_second=None, access_token=None,
-            cache=None, proxy_host=None, proxy_port=None):
+                 requests_per_second=None, access_token=None,
+                 cache=None, proxy_host=None, proxy_port=None):
         """Make an API request.
 
         :see: :class:`github2.client.Github`
@@ -59,7 +63,6 @@ def __init__(self, username=None, api_token=None, url_prefix=None,
         self.api_token = api_token
         self.access_token = access_token
         self.url_prefix = url_prefix
-        self.debug = debug
         if requests_per_second is None:
             self.delay = 0
         else:
@@ -117,8 +120,7 @@ def make_request(self, path, extra_post_data=None, method="GET"):
             since_last_in_seconds = (since_last.days * 24 * 60 * 60) + since_last.seconds + (since_last.microseconds/1000000.0)
             if since_last_in_seconds < self.delay:
                 duration = self.delay - since_last_in_seconds
-                if self.debug:
-                    sys.stderr.write("delaying API call %s\n" % duration)
+                LOGGER.warning("delaying API call %s second(s)", duration)
                 time.sleep(duration)
 
         extra_post_data = extra_post_data or {}
@@ -142,9 +144,9 @@ def raw_request(self, url, extra_post_data, method="GET"):
             query = self.encode_authentication_data(parse_qs(query))
         url = urlunsplit((scheme, netloc, path, query, fragment))
         response, content = self._http.request(url, method, post_data, headers)
-        if self.debug:
-            sys.stderr.write("URL:[%s] POST_DATA:%s RESPONSE_TEXT: [%s]\n" % (
-                             url, post_data, content))
+        if LOGGER.isEnabledFor(logging.DEBUG):
+            logging.debug("URL: %r POST_DATA: %r RESPONSE_TEXT: %r", url,
+                          post_data, content)
         if response.status >= 400:
             raise RuntimeError("unexpected response from github.com %d: %r" % (
                                response.status, content))
