py2 compatibility for html and queue module

youfou · youfou · commit 71ca5a9368ea · 2017-06-05T19:15:17.000+08:00
diff --git a/wxpy/api/bot.py b/wxpy/api/bot.py
@@ -5,21 +5,26 @@
 import functools
 import logging
 import os.path
-import queue
 import tempfile
 from pprint import pformat
 from threading import Thread
 
+try:
+    import queue
+except ImportError:
+    # noinspection PyUnresolvedReferences,PyPep8Naming
+    import Queue as queue
+
 import itchat
 
 from ..api.chats import Chat, Chats, Friend, Group, MP, User
 from ..api.consts import SYSTEM
 from ..api.messages import Message, MessageConfig, Messages, Registered
+from ..compatible import PY2
+from ..compatible.utils import force_encoded_string_output
 from ..utils import PuidMap
 from ..utils import enhance_connection, enhance_webwx_request, ensure_list, get_user_name, handle_response, \
     start_new_thread, wrap_user_name
-from ..compatible import PY2
-from ..compatible.utils import force_encoded_string_output
 
 logger = logging.getLogger(__name__)
 
diff --git a/wxpy/api/messages/message.py b/wxpy/api/messages/message.py
@@ -1,14 +1,22 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
-import html
 import logging
 import os
 import tempfile
 import weakref
 from datetime import datetime
 from xml.etree import ElementTree as ETree
 
+try:
+    import html
+except ImportError:
+    # Python 2.6-2.7
+    # noinspection PyUnresolvedReferences,PyUnresolvedReferences,PyCompatibility
+    from HTMLParser import HTMLParser
+
+    html = HTMLParser()
+
 from wxpy.api.chats import Chat, Group, Member, User
 from wxpy.compatible.utils import force_encoded_string_output
 from wxpy.utils import wrap_user_name
diff --git a/wxpy/api/messages/message_config.py b/wxpy/api/messages/message_config.py
@@ -6,7 +6,6 @@
 
 from wxpy.compatible.utils import force_encoded_string_output
 from wxpy.utils import ensure_list
-from ...compatible import *
 
 logger = logging.getLogger(__name__)
 
