Merge branch 'master' into api_v2

Author: boogheta

.github/workflows/deploy.yml

@@ -11,25 +11,19 @@ on:
 jobs:
   build:
     if: github.repository == 'python-twitter-tools/twitter'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: deploy-${{ hashFiles('**/setup.py') }}
-          restore-keys: |
-            deploy-
-
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: "3.x"
+          cache: pip
+          cache-dependency-path: setup.py
 
       - name: Install dependencies
         run: |

.github/workflows/tests.yml

@@ -18,32 +18,21 @@ jobs:
             "3.7",
             "3.8",
             "3.9",
-            "3.10-dev",
-            "pypy2",
+            "3.10",
+            "3.11-dev",
+            "pypy2.7",
         ]
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-
-      - name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key:
-            ${{ matrix.os }}-${{ matrix.python-version }}-v1-${{ hashFiles('**/setup.py') }}
-          restore-keys: |
-            ${{ matrix.os }}-${{ matrix.python-version }}-v1-
+          cache: pip
+          cache-dependency-path: setup.py
 
       - name: Install dependencies
         run: |

MANIFEST.in

@@ -1,6 +1,7 @@
 prune .github
-prune tests
+include tests/*.py
+include tests/*.png
 prune utils
 exclude .coveragerc
 exclude .gitignore
-exclude README.md
+exclude README.md

setup.py

@@ -28,6 +28,8 @@ def local_scheme(version):
           "Programming Language :: Python :: 3.7",
           "Programming Language :: Python :: 3.8",
           "Programming Language :: Python :: 3.9",
+          "Programming Language :: Python :: 3.10",
+          "Programming Language :: Python :: 3.11",
           "Programming Language :: Python :: Implementation :: CPython",
           "Programming Language :: Python :: Implementation :: PyPy",
           "Topic :: Communications :: Chat :: Internet Relay Chat",

tests/test_cmdline.py

@@ -3,7 +3,10 @@
 import json
 import re
 import unittest
-from mock import patch
+try:
+    from mock import patch
+except ImportError:
+    from unittest.mock import patch
 
 try:
     import HTMLParser

tests/test_util.py

@@ -49,7 +49,7 @@ def do_HEAD(self):
 
     httpd = SocketServer.TCPServer(("", 0), MyHandler)
     t = threading.Thread(target=httpd.serve_forever)
-    t.setDaemon(True)
+    t.daemon = True
     t.start()
     port = httpd.server_address[1]
     yield functools.partial(url, port)

twitter/api.py

@@ -40,6 +40,11 @@
 except ImportError:
     import simplejson as json
 
+try:
+    from json.decoder import JSONDecodeError
+except ImportError:
+    JSONDecodeError = ValueError
+
 
 class _DEFAULT(object):
     pass
@@ -397,7 +402,7 @@ def _handle_response(self, req, uri, arg_data, _timeout=None):
             elif "json" == self.format or uri.startswith("2/"):
                 try:
                     res = json.loads(data.decode('utf8'))
-                except json.decoder.JSONDecodeError as e:
+                except JSONDecodeError as e:
                     # it seems like the data received was incomplete
                     # and we should catch it to allow retries
                     raise TwitterError("Incomplete JSON data collected for %s (%s): %s)" % (uri, arg_data, e))

twitter/cmdline.py

@@ -578,7 +578,7 @@ def __call__(self, twitter, options):
                      else str(input("message: ")))
         statusTxt = statusTxt.replace('\\n', '\n')
         replies = []
-        ptr = re.compile("@[\w_]+")
+        ptr = re.compile(r"@[\w_]+")
         while statusTxt:
             s = ptr.match(statusTxt)
             if s and s.start() == 0:

twitter/ircbot.py

@@ -153,15 +153,18 @@ def __init__(self, configFilename):
         self.irc = irclib.IRC()
         self.irc.add_global_handler('privmsg', self.handle_privmsg)
         self.irc.add_global_handler('ctcp', self.handle_ctcp)
-        self.irc.add_global_handler('umode', self.handle_umode)
+        self.irc.add_global_handler('welcome', self.handle_welcome)
         self.ircServer = self.irc.server()
 
+        self.welcome_received = False
         self.sched = Scheduler(
             (SchedTask(self.process_events, 1),
              SchedTask(self.check_statuses, 120)))
         self.lastUpdate = (datetime.utcnow() - timedelta(minutes=10)).utctimetuple()
 
     def check_statuses(self):
+        if not self.welcome_received:
+            return
         debug("In check_statuses")
         try:
             updates = reversed(self.twitter.statuses.home_timeline())
@@ -226,18 +229,16 @@ def handle_ctcp(self, conn, evt):
             elif args[0] == 'CLIENTINFO':
                 conn.ctcp_reply(source, "CLIENTINFO PING VERSION CLIENTINFO")
 
-    def handle_umode(self, conn, evt):
+    def handle_welcome(self, conn, evt):
         """
-        QuakeNet ignores all your commands until after the MOTD. This
-        handler defers joining until after it sees a magic line. It
-        also tries to join right after connect, but this will just
-        make it join again which should be safe.
+        Undernet and QuakeNet ignore all your commands until it receives 001. This
+        handler defers joining until after it sees a magic line.
         """
-        args = evt.arguments()
-        if (args and args[0] == '+i'):
-            channels = self.config.get('irc', 'channel').split(',')
-            for channel in channels:
-                self.ircServer.join(channel)
+        self.welcome_received = True
+        channels = self.config.get('irc', 'channel').split(',')
+        for channel in channels:
+            self.ircServer.join(channel)
+        self.check_statuses()
 
     def privmsg_channels(self, msg):
         return_response=True
@@ -288,13 +289,11 @@ def unfollow(self, conn, evt, name):
                     get_prefix('inform'), userNick, name))
 
     def _irc_connect(self):
+        self.welcome_received = False
         self.ircServer.connect(
             self.config.get('irc', 'server'),
             self.config.getint('irc', 'port'),
             self.config.get('irc', 'nick'))
-        channels=self.config.get('irc', 'channel').split(',')
-        for channel in channels:
-            self.ircServer.join(channel)
 
     def run(self):
         self._irc_connect()

twitter/util.py

@@ -159,8 +159,8 @@ def expand_line(line, sites):
 
 def parse_host_list(list_of_hosts):
     """Parse the comma separated list of hosts."""
-    p = set(
-        m.group(1) for m in re.finditer("\s*([^,\s]+)\s*,?\s*", list_of_hosts))
+    p = {
+        m.group(1) for m in re.finditer(r"\s*([^,\s]+)\s*,?\s*", list_of_hosts)}
     return p