Add support for Python2

bluedazzle · bluedazzle · commit 1c387472dab0 · 2017-05-16T17:07:26.000+08:00
Change-Id: I81ef1e3cc2e2b23a86aa2acbc3b6f292224e3140
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,3 @@
 itchat==1.2.32
 requests
+future
diff --git a/wxpy/__compat__.py b/wxpy/__compat__.py
diff --git a/wxpy/__main__.py b/wxpy/__main__.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 from .utils import shell_entry
 
 if __name__ == '__main__':
diff --git a/wxpy/api/bot.py b/wxpy/api/bot.py
@@ -1,3 +1,6 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
 import atexit
 import functools
 import logging
@@ -15,9 +18,13 @@
 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 *
 
 logger = logging.getLogger(__name__)
 
+if PY2:
+    from future.builtins import str
+
 
 class Bot(object):
     """
@@ -86,13 +93,18 @@ def __init__(
 
         self.is_listening = False
         self.listening_thread = None
-
-        self.temp_dir = tempfile.TemporaryDirectory(prefix='wxpy_')
+        if PY2:
+            from wxpy.compatible.utils import TemporaryDirectory
+            self.temp_dir = TemporaryDirectory(prefix='wxpy_')
+        else:
+            self.temp_dir = tempfile.TemporaryDirectory(prefix='wxpy_')
         self.start()
 
         atexit.register(self._cleanup)
 
     def __repr__(self):
+        if PY2:
+            return '<{}: {}>'.format(unicode(self.__class__.__name__), unicode(self.self.name))
         return '<{}: {}>'.format(self.__class__.__name__, self.self.name)
 
     @handle_response()
diff --git a/wxpy/api/chats/chat.py b/wxpy/api/chats/chat.py
@@ -1,14 +1,17 @@
-import datetime
+# coding: utf-8
 import logging
 import re
 import time
+import datetime
 from functools import partial, wraps
 
 from wxpy.api.consts import ATTACHMENT, PICTURE, TEXT, VIDEO
 from wxpy.utils import handle_response
 
 logger = logging.getLogger(__name__)
 
+from ...compatible import *
+
 
 def wrap_sender(msg_type):
     """
diff --git a/wxpy/api/chats/chats.py b/wxpy/api/chats/chats.py
@@ -1,8 +1,11 @@
+# coding: utf-8
+
 import logging
 import time
 from collections import Counter
 
 from wxpy.utils import match_attributes, match_name
+from wxpy.compatible import *
 
 logger = logging.getLogger(__name__)
 
diff --git a/wxpy/api/chats/friend.py b/wxpy/api/chats/friend.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import logging
 
 from wxpy.utils import handle_response
diff --git a/wxpy/api/chats/group.py b/wxpy/api/chats/group.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import logging
 
 from wxpy.utils import ensure_list, get_user_name, handle_response, wrap_user_name
diff --git a/wxpy/api/chats/groups.py b/wxpy/api/chats/groups.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 from wxpy.utils import ensure_list, match_attributes, match_name
 from .user import User
 
diff --git a/wxpy/api/chats/member.py b/wxpy/api/chats/member.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 from .user import User
 
 
diff --git a/wxpy/api/chats/mp.py b/wxpy/api/chats/mp.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 from .user import User
 
 
diff --git a/wxpy/api/chats/user.py b/wxpy/api/chats/user.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 from .chat import Chat
 
 
diff --git a/wxpy/api/consts.py b/wxpy/api/consts.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+from __future__ import unicode_literals
 # 文本
 TEXT = 'Text'
 # 位置
diff --git a/wxpy/api/messages/message.py b/wxpy/api/messages/message.py
@@ -1,3 +1,6 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
 import html
 import logging
 import os
diff --git a/wxpy/api/messages/message_config.py b/wxpy/api/messages/message_config.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import logging
 import weakref
 
diff --git a/wxpy/api/messages/messages.py b/wxpy/api/messages/messages.py
@@ -1,3 +1,4 @@
+# coding: utf-8
 import threading
 
 from wxpy.utils import match_attributes, match_text
diff --git a/wxpy/api/messages/registered.py b/wxpy/api/messages/registered.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import weakref
 
 from wxpy.api.consts import SYSTEM
diff --git a/wxpy/api/messages/sent_message.py b/wxpy/api/messages/sent_message.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import logging
 
 from . import Message
diff --git a/wxpy/compatible/__init__.py b/wxpy/compatible/__init__.py
@@ -0,0 +1,12 @@
+# coding: utf-8
+import sys as _sys
+
+PY_VERSION = _sys.version
+PY2 = PY_VERSION < '3'
+
+if PY2:
+    from future.standard_library import print_function
+    from future.builtins import str, int
+
+
+
diff --git a/wxpy/compatible/utils.py b/wxpy/compatible/utils.py
@@ -0,0 +1,90 @@
+# coding: utf-8
+from __future__ import print_function
+import warnings as _warnings
+import os as _os
+import sys as _sys
+
+from tempfile import mkdtemp
+
+from . import *
+
+
+class TemporaryDirectory(object):
+    """Create and return a temporary directory.  This has the same
+    behavior as mkdtemp but can be used as a context manager.  For
+    example:
+
+        with TemporaryDirectory() as tmpdir:
+            ...
+
+    Upon exiting the context, the directory and everything contained
+    in it are removed.
+    """
+
+    def __init__(self, suffix="", prefix="tmp", dir=None):
+        self._closed = False
+        self.name = None  # Handle mkdtemp raising an exception
+        self.name = mkdtemp(suffix, prefix, dir)
+
+    def __repr__(self):
+        return "<{} {!r}>".format(self.__class__.__name__, self.name)
+
+    def __enter__(self):
+        return self.name
+
+    def cleanup(self, _warn=False):
+        if self.name and not self._closed:
+            try:
+                self._rmtree(self.name)
+            except (TypeError, AttributeError) as ex:
+                # Issue #10188: Emit a warning on stderr
+                # if the directory could not be cleaned
+                # up due to missing globals
+                if "None" not in str(ex):
+                    raise
+                print("ERROR: {!r} while cleaning up {!r}".format(ex, self, ), file=_sys.stderr)
+                return
+            self._closed = True
+            if _warn:
+                self._warn("Implicitly cleaning up {!r}".format(self),
+                           ResourceWarning)
+
+    def __exit__(self, exc, value, tb):
+        self.cleanup()
+
+    def __del__(self):
+        # Issue a ResourceWarning if implicit cleanup needed
+        self.cleanup(_warn=True)
+
+    # XXX (ncoghlan): The following code attempts to make
+    # this class tolerant of the module nulling out process
+    # that happens during CPython interpreter shutdown
+    # Alas, it doesn't actually manage it. See issue #10188
+    _listdir = staticmethod(_os.listdir)
+    _path_join = staticmethod(_os.path.join)
+    _isdir = staticmethod(_os.path.isdir)
+    _islink = staticmethod(_os.path.islink)
+    _remove = staticmethod(_os.remove)
+    _rmdir = staticmethod(_os.rmdir)
+    _warn = _warnings.warn
+
+    def _rmtree(self, path):
+        # Essentially a stripped down version of shutil.rmtree.  We can't
+        # use globals because they may be None'ed out at shutdown.
+        for name in self._listdir(path):
+            fullname = self._path_join(path, name)
+            try:
+                isdir = self._isdir(fullname) and not self._islink(fullname)
+            except OSError:
+                isdir = False
+            if isdir:
+                self._rmtree(fullname)
+            else:
+                try:
+                    self._remove(fullname)
+                except OSError:
+                    pass
+        try:
+            self._rmdir(path)
+        except OSError:
+            pass
diff --git a/wxpy/exceptions.py b/wxpy/exceptions.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 class ResponseError(Exception):
     """
     当 BaseResponse 的返回值不为 0 时抛出的异常
diff --git a/wxpy/ext/logging_with_wechat.py b/wxpy/ext/logging_with_wechat.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import logging
 
 from wxpy.utils import get_receiver
diff --git a/wxpy/ext/talk_bot_utils.py b/wxpy/ext/talk_bot_utils.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import random
 import re
 
diff --git a/wxpy/ext/tuling.py b/wxpy/ext/tuling.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import logging
 import pprint
 
@@ -6,6 +8,7 @@
 from wxpy.ext.talk_bot_utils import get_context_user_id, next_topic
 from wxpy.utils.misc import get_text_without_at_bot
 from wxpy.utils import enhance_connection
+from wxpy.compatible import *
 
 logger = logging.getLogger(__name__)
 
diff --git a/wxpy/ext/xiaoi.py b/wxpy/ext/xiaoi.py
@@ -15,6 +15,7 @@
 
 logger = logging.getLogger(__name__)
 
+from wxpy.compatible import *
 
 class XiaoI(object):
     """
diff --git a/wxpy/main.py b/wxpy/main.py
@@ -0,0 +1,14 @@
+# coding: utf-8
+# from __future__ import unicode_literals
+from future.builtins import str
+# 导入模块
+from wxpy import *
+
+# 初始化机器人，扫码登陆
+bot = Bot('bot.pkl')
+my_friend = bot.friends().search('rapospectre')[0]
+my_friend.send('Hello WeChat!')
+
+# a = str('abc')
+#
+# print type(a)
diff --git a/wxpy/utils/base_request.py b/wxpy/utils/base_request.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import functools
 import json
 
diff --git a/wxpy/utils/console.py b/wxpy/utils/console.py
@@ -1,3 +1,5 @@
+# coding: utf-8
+
 import inspect
 
 
diff --git a/wxpy/utils/misc.py b/wxpy/utils/misc.py
@@ -1,3 +1,6 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
 import inspect
 import logging
 import re
@@ -9,6 +12,10 @@
 from requests.adapters import HTTPAdapter
 
 from wxpy.exceptions import ResponseError
+from wxpy.compatible import PY2
+
+if PY2:
+    from future.builtins import str
 
 
 def check_response_body(response_body):
@@ -157,7 +164,6 @@ def match_name(chat, keywords):
     :param keywords: 关键词，可以是空白分割的 str，或是多个精准关键词组成的 list
     :return: 若包含了所有的关键词则为 True，否则为 False
     """
-
     keywords = prepare_keywords(keywords)
 
     for kw in keywords:
@@ -203,6 +209,9 @@ def wrap_one(x):
         elif isinstance(x, str):
             return {'UserName': user_or_users}
         else:
+            if PY2:
+                if isinstance(x, unicode):
+                    return {'UserName': user_or_users}
             raise TypeError('Unsupported type: {}'.format(type(x)))
 
     return smart_map(wrap_one, user_or_users)
@@ -358,12 +367,16 @@ def start_new_thread(target, args=(), kwargs=None, daemon=True, use_caller_name=
         # 使用外层的 logger
         inspect.currentframe().f_back.f_globals.get('__name__')
     ).debug('new thread: {}'.format(name))
-
-    _thread = threading.Thread(
-        target=target, args=args, kwargs=kwargs,
-        name=name, daemon=daemon
-    )
-
+    if PY2:
+        _thread = threading.Thread(
+            target=target, args=args, kwargs=kwargs,
+            name=name)
+        _thread.setDaemon(daemon)
+    else:
+        _thread = threading.Thread(
+            target=target, args=args, kwargs=kwargs,
+            name=name, daemon=daemon
+        )
     _thread.start()
 
     return _thread
diff --git a/wxpy/utils/puid_map.py b/wxpy/utils/puid_map.py
diff --git a/wxpy/utils/tools.py b/wxpy/utils/tools.py

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`itchat==1.2.32`
`2`	`2`	`requests`
	`3`	`+future`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# coding: utf-8`
	`2`	`+`
`1`	`3`	`from .utils import shell_entry`
`2`	`4`
`3`	`5`	`if __name__ == '__main__':`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# coding: utf-8`
	`2`	`+`
`1`	`3`	`import logging`
`2`	`4`
`3`	`5`	`from wxpy.utils import handle_response`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# coding: utf-8`
	`2`	`+`
`1`	`3`	`from wxpy.utils import ensure_list, match_attributes, match_name`
`2`	`4`	`from .user import User`
`3`	`5`