{"repo": "jarodl/flask-github", "pull_number": 3, "instance_id": "jarodl__flask-github-3", "issue_numbers": "", "base_commit": "985887fd227a07c424c2f953dc2d285bcc67b0ab", "patch": "diff --git a/flaskext/github.py b/flask_github.py\nsimilarity index 81%\nrename from flaskext/github.py\nrename to flask_github.py\n--- a/flaskext/github.py\n+++ b/flask_github.py\n@@ -5,14 +5,14 @@\n \n     Authenticate users in your Flask app with Github.\n \"\"\"\n-import json\n-import oauth2\n-from httplib2 import Http\n from functools import wraps\n from urllib import urlencode\n from urlparse import parse_qs\n+\n+import requests\n from flask import redirect, request\n \n+\n class GithubAuth(object):\n     \"\"\"\n     Provides decorators for authenticating users with Github within a Flask\n@@ -37,6 +37,7 @@ def __init__(self, client_id, client_secret, session_key):\n         self.get_access_token = lambda: None\n         self.base_url = 'https://api.github.com/'\n         self.base_auth_url = 'https://github.com/login/oauth/'\n+        self.session = requests.session()\n \n     def access_token_getter(self, f):\n         \"\"\"\n@@ -62,25 +63,26 @@ def authorize(self, callback_url=None, scope=None):\n         auth_url = self.base_auth_url + 'authorize?' + urlencode(params)\n         return redirect(auth_url)\n \n-    def raw_request(self, base_url, resource, params, method, accept='json'):\n+    def raw_request(self, base_url, resource, params, method,\n+                    access_token=None):\n         \"\"\"\n         Makes a raw HTTP request and returns the response and content.\n         \"\"\"\n-        http = Http(disable_ssl_certificate_validation=True)\n-        params.update({'access_token': self.get_access_token()})\n-        headers = {\n-            \"Content-type\": \"application/x-www-form-urlencoded\",\n-            \"Accept\": accept\n-        }\n-        url = base_url + resource + '?' + urlencode(params)\n-        resp, content = http.request(url, method)\n-        return resp, content\n+        url = base_url + resource\n+        if params is None:\n+            params = {}\n+        if access_token is None:\n+            access_token = self.get_access_token()\n+        params.update({'access_token': access_token})\n+        return self.session.request(method, url, params)\n \n-    def get_resource(self, resource, params={}):\n+    def get_resource(self, resource, params=None, access_token=None):\n         \"\"\"\n         Makes a raw HTTP GET request and returns the response and content.\n         \"\"\"\n-        return self.raw_request(self.base_url, resource, params, \"GET\")\n+        response = self.raw_request(\n+            self.base_url, resource, params, \"GET\", access_token)\n+        return response, response.json()\n \n     def handle_response(self):\n         \"\"\"\n@@ -94,18 +96,16 @@ def handle_response(self):\n             'client_id': self.client_id,\n             'client_secret': self.client_secret\n         }\n-        resp, content = self.raw_request(self.base_auth_url, 'access_token',\n-            params, \"POST\")\n-        data = parse_qs(content)\n+        response = self.raw_request(\n+            self.base_auth_url, 'access_token', params, \"POST\")\n+        data = parse_qs(response.content)\n         for k, v in data.items():\n             if len(v) == 1:\n                 data[k] = v[0]\n         return data\n \n     def handle_invalid_response(self):\n-        \"\"\"\n-        \"\"\"\n-        return None\n+        pass\n \n     def authorized_handler(self, f):\n         \"\"\"\n@@ -136,8 +136,7 @@ def get_github_user(self):\n         Requests the authenticated user's data from Github.\n         \"\"\"\n         path = 'user'\n-        resp, content = self.get_resource(path)\n-        user = json.loads(content)\n+        resp, user = self.get_resource(path)\n         return user\n \n     def has_org_access(self, organization):\n@@ -146,8 +145,7 @@ def has_org_access(self, organization):\n         organization.\n         \"\"\"\n         path = 'orgs/' + organization + '/members'\n-        resp, content = self.get_resource(path)\n-        org_members = json.loads(content)\n+        resp, org_members = self.get_resource(path)\n         user = self.github_user()\n         for member in org_members:\n             if member['login'] == user['login']:\ndiff --git a/flaskext/__init__.py b/flaskext/__init__.py\ndeleted file mode 100644\n--- a/flaskext/__init__.py\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-__import__('pkg_resources').declare_namespace(__name__)\n-\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -16,13 +16,13 @@\n     author_email='jarodluebbert@gmail.com',\n     description='Adds support for authorizing users with Github to Flask',\n     long_description=__doc__,\n-    packages=['flaskext'],\n-    namespace_packages=['flaskext'],\n+    py_modules=['flask_github'],\n     zip_safe=False,\n+    include_package_data=True,\n     platforms='any',\n     install_requires=[\n         'Flask',\n-        'oauth2'\n+        'requests',\n     ],\n     classifiers=[\n         'Environment :: Web Environment',\n@@ -33,4 +33,3 @@\n         'Topic :: Software Development :: Libraries :: Python Modules'\n     ]\n )\n-\n", "test_patch": "diff --git a/tests.py b/tests.py\ndeleted file mode 100644\n", "problem_statement": "", "hints_text": "", "created_at": "2013-05-26T10:44:46Z"}