fix lint errors

Author: Joshua Li

sentry_auth_github/client.py

@@ -1,5 +1,6 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
 
+import six
 from requests.exceptions import RequestException
 from sentry import http
 from sentry.utils import json
@@ -35,7 +36,7 @@ def _request(self, path, access_token):
                 headers=headers,
             )
         except RequestException as e:
-            raise GitHubApiError(unicode(e), status=getattr(e, 'status_code', 0))
+            raise GitHubApiError(six.text_type(e), status=getattr(e, 'status_code', 0))
         if req.status_code < 200 or req.status_code >= 300:
             raise GitHubApiError(req.content, status=req.status_code)
         return json.loads(req.content)
@@ -51,8 +52,8 @@ def get_user_emails(self, access_token):
 
     def is_org_member(self, access_token, org_id):
         org_list = self.get_org_list(access_token)
-        org_id = str(org_id)
+        org_id = six.binary_type(org_id)
         for o in org_list:
-            if str(o['id']) == org_id:
+            if six.binary_type((o['id']) == org_id:
                 return True
         return False

sentry_auth_github/views.py

@@ -1,5 +1,6 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
 
+import six
 from django import forms
 from sentry.auth.view import AuthView, ConfigureView
 from sentry.models import AuthIdentity
@@ -127,7 +128,7 @@ def handle(self, request, helper):
         form = SelectOrganizationForm(org_list, request.POST or None)
         if form.is_valid():
             org_id = form.cleaned_data['org']
-            org = [o for o in org_list if org_id == str(o['id'])][0]
+            org = [o for o in org_list if org_id == six.binary_type(o['id'])][0]
             helper.bind_state('org', org)
             return helper.next_step()
 

setup.py

@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+
+from __future__ import absolute_import
+
 """
 sentry-auth-github
 ==================

tests/test_plugin.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import, print_function
+from __future__ import absolute_import
 
 import pytest