Merge pull request #642 from JieZhaoAllen/bootswatch-dev

解决xadmin主题无效的问题

Author: wgbbiao

xadmin/plugins/themes.py

@@ -1,6 +1,6 @@
 #coding:utf-8
 from __future__ import print_function
-import httplib2
+import requests
 from django.template import loader
 from django.core.cache import cache
 from django.utils import six
@@ -71,16 +71,13 @@ def block_top_navmenu(self, context, nodes):
             else:
                 ex_themes = []
                 try:
-                    h = httplib2.Http()
-                    resp, content = h.request("https://bootswatch.com/api/3.json", 'GET', '',
-                        headers={"Accept": "application/json", "User-Agent": self.request.META['HTTP_USER_AGENT']})
+                    headers = {"Accept": "application/json", "User-Agent": self.request.META['HTTP_USER_AGENT']}
+                    content = requests.get("https://bootswatch.com/api/3.json", headers=headers)
                     if six.PY3:
-                        content = content.decode()
-                    watch_themes = json.loads(content)['themes']
-                    ex_themes.extend([
-                        {'name': t['name'], 'description': t['description'],
-                            'css': t['cssMin'], 'thumbnail': t['thumbnail']}
-                        for t in watch_themes])
+                        content = content.text.decode()
+                    watch_themes = json.loads(content.text)['themes']
+                    ex_themes.extend([{'name': t['name'], 'description': t['description'], 'css': t['cssMin'],
+                                       'thumbnail': t['thumbnail']} for t in watch_themes])
                 except Exception as e:
                     print(e)