Merge pull request Urinx#3 from Haskely/Python-3

Fix bugs
uniapper · Feb 21, 2017 · 0834dfa · 0834dfa
2 parents 02a1c53 + 28bb790
commit 0834dfa
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/weixin.py b/weixin.py
@@ -641,24 +641,24 @@ def getUserRemarkName(self, id):
             for member in self.SpecialUsersList:
                 if member['UserName'] == id:
                     name = member['RemarkName'] if member[
-                        b'RemarkName'] else member['NickName']
+                        'RemarkName'] else member['NickName']
 
             # 公众号或服务号
             for member in self.PublicUsersList:
                 if member['UserName'] == id:
                     name = member['RemarkName'] if member[
-                        b'RemarkName'] else member['NickName']
+                        'RemarkName'] else member['NickName']
 
             # 直接联系人
             for member in self.ContactList:
                 if member['UserName'] == id:
                     name = member['RemarkName'] if member[
-                        b'RemarkName'] else member['NickName']
+                        'RemarkName'] else member['NickName']
             # 群友
             for member in self.GroupMemeberList:
                 if member['UserName'] == id:
                     name = member['DisplayName'] if member[
-                        b'DisplayName'] else member['NickName']
+                        'DisplayName'] else member['NickName']
 
         if name == '未知群' or name == '陌生人':
             logging.debug(id)
@@ -910,7 +910,7 @@ def sendMsg(self, name, word, isfile=False):
     def sendMsgToAll(self, word):
         for contact in self.ContactList:
             name = contact['RemarkName'] if contact[
-                b'RemarkName'] else contact['NickName']
+                'RemarkName'] else contact['NickName']
             id = contact['UserName']
             self._echo('-> ' + name + ': ' + word)
             if self.webwxsendmsg(word, id):