Reuse a single requests.Session instance per thread (see nmlorg/netabot@0045680).

Release as 0.3.25.3.

Author: nmlorg

metabot/modules/groups.py

@@ -6,7 +6,6 @@
 import re
 
 import ntelebot
-import requests
 
 
 def cgi_escape(text):  # pylint: disable=missing-docstring
@@ -201,7 +200,7 @@ def fetch_opengraph(url):
     """Basic (and fragile) Open Graph object fetcher/decoder."""
 
     values = {}
-    for line in requests.get(url, timeout=10).text.splitlines():
+    for line in ntelebot.requests.get(url, timeout=10).text.splitlines():
         ret = re.search('<meta property="og:([^"]+)" content="([^"]*)">', line)
         if ret:
             key, value = ret.groups()

metabot/util/geoutil.py

@@ -5,7 +5,7 @@
 import urllib.parse
 
 import googlemaps
-import requests
+import ntelebot
 
 from metabot.util import iso8601
 from metabot.util import pickleutil
@@ -44,7 +44,7 @@ def _weatherfetch(url):
     headers = {
         'user-agent': 'https://github.com/nmlorg/metabot',
     }
-    return requests.get(url, headers=headers, timeout=10).json()
+    return ntelebot.requests.get(url, headers=headers, timeout=10).json()
 
 
 def _weatherpoint(lat, lon):

metabot/util/tickets.py

@@ -4,7 +4,7 @@
 import logging
 import re
 
-import requests
+import ntelebot
 
 
 def get_info(text):
@@ -20,30 +20,31 @@ def _brownpapertickets(text):
             '://(www.|m.|)(brownpapertickets.com|bpt.me)/event/([0-9]+)', text)
     }
     for event_id in sorted(events):
-        ret = re.search('>([0-9]+) tickets remaining',
-                        requests.get('https://m.bpt.me/event/' + event_id, timeout=10).text)
+        ret = re.search(
+            '>([0-9]+) tickets remaining',
+            ntelebot.requests.get(f'https://m.bpt.me/event/{event_id}', timeout=10).text)
         if ret:
             remaining = int(ret.groups()[0])
         else:
             remaining = 0
-        yield remaining, 'https://bpt.me/event/' + event_id
+        yield remaining, f'https://bpt.me/event/{event_id}'
 
 
 def _eventbrite(text):
     events = {
         event_id for _, event_id in re.findall('://www.eventbrite.com/e/([^/]+-)?([0-9]+)', text)
     }
     for event_id in sorted(events):
-        url = 'https://www.eventbrite.com/ajax/event/%s/ticket_classes/for_sale/' % event_id
+        url = f'https://www.eventbrite.com/ajax/event/{event_id}/ticket_classes/for_sale/'
         try:
-            data = requests.get(url,
-                                timeout=10,
-                                params={
-                                    'pos': 'online',
-                                },
-                                headers={
-                                    'x-requested-with': 'XMLHttpRequest',
-                                }).json()
+            data = ntelebot.requests.get(url,
+                                         timeout=10,
+                                         params={
+                                             'pos': 'online',
+                                         },
+                                         headers={
+                                             'x-requested-with': 'XMLHttpRequest',
+                                         }).json()
         except json.decoder.JSONDecodeError:
             logging.exception('Decoding %s:', url)
         else:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = 'metabot'
-version = '0.3.25.2'
+version = '0.3.25.3'
 description = 'Modularized, multi-account bot.'
 readme = 'README.md'
 authors = [
@@ -9,10 +9,9 @@ authors = [
 requires-python = '>=3.8'
 dependencies = [
     'googlemaps',
-    'ntelebot >= 0.4.3',
+    'ntelebot >= 0.4.4',
     'pytz',
     'PyYAML >= 5.1',
-    'requests',
 ]
 
 [project.optional-dependencies]