various update, mysql-python requirement

Author: aquarhead

conns/api_keys.py

@@ -53,3 +53,17 @@
 ###
 # 百度地图
 BAIDU_KEY = "8e5c27873f9b75448ae86a905abbe41c"
+
+###
+# 街旁
+JIEPANG_CLIENT_ID = "100698"
+JIEPANG_CLIENT_SECRET = "5383aac191dfc823988926c0fb8c8398"
+JIEPANG_AUTH_URL = "https://jiepang.com/oauth/authorize"
+JIEPANG_TOKEN_URL = "https://jiepang.com/oauth/token"
+
+###
+# 腾讯微博
+TQQ_CLIENT_ID = "801287948"
+TQQ_CLIENT_SECRET = "a663feec88c945d0db8e7a7f16a3a43f"
+TQQ_AUTH_URL = "https://open.t.qq.com/cgi-bin/oauth2/authorize"
+TQQ_TOKEN_URL = "https://open.t.qq.com/cgi-bin/oauth2/access_token"

conns/views.py

@@ -11,7 +11,7 @@
 import requests
 import urlparse
 
-
+ 
 def weibo_connect():
     args = {
         'response_type': "code",
@@ -23,7 +23,6 @@ def weibo_connect():
 def weibo_callback():
     if "error" in request.args:
         errors = request.args
-        return
     else:
         args = {
             'grant_type': "authorization_code",
@@ -48,7 +47,6 @@ def renren_connect():
 def renren_callback():
     if "error" in request.args:
         errors = request.args
-        return
     else:
         args = {
             'grant_type': "authorization_code",
@@ -63,26 +61,24 @@ def renren_callback():
 
 def github_connect():
     args = {
-        'response_type': "code"
-        'client_id': GITHUB_CLIENT_ID
-        'redirect_uri': ROOT_URL+"conns/github_callback"
+        'response_type': "code",
+        'client_id': GITHUB_CLIENT_ID,
+        'redirect_uri': ROOT_URL+"conns/github_callback",
         'scope': 'user'
     }
     return redirect(requests.get(GITHUB_AUTH_URL, param=args, prefetch=False, allow_redirects=False).url)
 
 def github_callback():
     if "error" in request.args:
         errors = request.args
-        return
     else:
         args = {
             'grant_type': "authorization_code",
             'client_id': GITHUB_CLIENT_ID,
             'client_secret': GITHUB_CLIENT_SECRET,
-            'redirect_uri': ROOT_URL+"conns/github_callback",
             'code': request.args["code"]
         }
-        auth_info = requests.post(RENREN_TOKEN_URL, params=args).json
+        auth_info = urlparse.parse_qs(requests.post(GITHUB_TOKEN_URL, params=args).text)
     return
 
 
@@ -98,7 +94,6 @@ def douban_connect():
 def douban_callback():
     if "error" in request.args:
         errors = request.args
-        return
     else:
         args = {
             'grant_type': "authorization_code",
@@ -110,6 +105,7 @@ def douban_callback():
         auth_info = requests.post(DOUBAN_TOKEN_URL, params=args).json
     return
 
+
 def facebook_connect():
     args = {
         'client_id': FACEBOOK_CLIENT_ID,
@@ -120,7 +116,6 @@ def facebook_connect():
 def facebook_callback():
     if "error" in request.args:
         errors = request.args
-        return
     else:
         args = {
             'client_id': FACEBOOK_CLIENT_ID,
@@ -131,4 +126,28 @@ def facebook_callback():
         auth_info = urlparse.parse_qs(requests.post(FACEBOOK_TOKEN_URL, params=args).text)
     return
 
-# twitter, weixin, G+, github
+
+def tqq_connect():
+    args = {
+        'response_type': "code",
+        'client_id': TQQ_CLIENT_ID,
+        'redirect_uri': ROOT_URL+"conns/tqq_callback",
+    }
+    return redirect(requests.get(TQQ_AUTH_URL, params=args, prefetch=False, allow_redirects=False).url)
+
+def tqq_callback():
+    if "error" in request.args:
+        errors = request.args
+    else:
+        args = {
+            'grant_type': "authorization_code",
+            'client_id': TQQ_CLIENT_ID,
+            'client_secret': TQQ_CLIENT_SECRET,
+            'redirect_uri': ROOT_URL+"conns/tqq_callback",
+            'code': request.args["code"]
+        }
+        auth_info = urlparse.parse_qs(requests.post(FACEBOOK_TOKEN_URL, params=args).text)
+    return
+
+
+# tqq, jiepang, twitter, G+

dj15req.txt

@@ -1,6 +1,6 @@
 Django==1.5b2
-requests==0.14.2
-wsgiref==0.1.2
+MySQL-python==1.2.4c1
 South==0.7.6
 django-annoying==0.7.6
-
+requests==0.14.2
+wsgiref==0.1.2