diff --git a/ircbot/bot.py b/ircbot/bot.py index cfab517..5d0172b 100644 --- a/ircbot/bot.py +++ b/ircbot/bot.py @@ -6,25 +6,22 @@ import copy import importlib import logging import re -from xmlrpc.server import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler import socket import ssl import sys import threading import time +from xmlrpc.server import SimpleXMLRPCRequestHandler, SimpleXMLRPCServer -from django.conf import settings - -import irc.buffer import irc.client +import irc.modes from irc.connection import Factory from irc.dict import IRCDict -import irc.modes +from jaraco.stream import buffer import ircbot.lib as ircbotlib from ircbot.models import Alias, IrcChannel, IrcPlugin, IrcServer - log = logging.getLogger('ircbot.bot') @@ -52,7 +49,7 @@ class LenientServerConnection(irc.client.ServerConnection): method on a Reactor object. """ - buffer_class = irc.buffer.LenientDecodingLineBuffer + buffer_class = buffer.LenientDecodingLineBuffer server_config = None diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 7ce8820..bfd1323 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in @@ -22,7 +22,7 @@ click==8.1.3 # via # pip-tools # safety -coverage[toml]==7.1.0 +coverage[toml]==7.2.1 # via pytest-cov distlib==0.3.6 # via virtualenv @@ -77,19 +77,15 @@ flake8-mutable==1.2.0 # via -r requirements/requirements-dev.in gitdb==4.0.10 # via gitpython -gitpython==3.1.30 +gitpython==3.1.31 # via bandit idna==3.4 # via requests -importlib-resources==5.10.2 - # via jaraco-text inflect==6.0.2 - # via - # jaraco-itertools - # jaraco-text + # via jaraco-text iniconfig==2.0.0 # via pytest -irc==15.0.6 +irc==20.1.0 # via -r requirements/requirements.in isort==5.12.0 # via flake8-isort @@ -99,13 +95,11 @@ jaraco-collections==3.8.0 # via irc jaraco-context==4.3.0 # via jaraco-text -jaraco-functools==3.5.2 +jaraco-functools==3.6.0 # via # irc # jaraco-text # tempora -jaraco-itertools==6.2.1 - # via irc jaraco-logging==3.1.2 # via irc jaraco-stream==3.0.3 @@ -116,12 +110,11 @@ jaraco-text==3.11.1 # jaraco-collections mccabe==0.7.0 # via flake8 -more-itertools==9.0.0 +more-itertools==9.1.0 # via # irc # jaraco-classes # jaraco-functools - # jaraco-itertools # jaraco-text packaging==21.3 # via @@ -134,7 +127,7 @@ parsedatetime==2.6 # via -r requirements/requirements.in pbr==5.11.1 # via stevedore -pip-tools==6.12.2 +pip-tools==6.12.3 # via -r requirements/requirements-dev.in platformdirs==3.0.0 # via virtualenv @@ -197,7 +190,6 @@ safety==2.3.5 # via -r requirements/requirements-dev.in six==1.16.0 # via - # irc # python-dateutil # tox smmap==5.0.0 @@ -233,7 +225,7 @@ urllib3==1.26.14 # via requests versioneer==0.28 # via -r requirements/requirements-dev.in -virtualenv==20.19.0 +virtualenv==20.20.0 # via tox wheel==0.38.4 # via @@ -241,8 +233,6 @@ wheel==0.38.4 # tox-wheel zalgo-text==0.6 # via -r requirements/requirements.in -zipp==3.13.0 - # via importlib-resources # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/requirements.in b/requirements/requirements.in index 8650e75..ad5bae7 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -3,7 +3,7 @@ django-adminplus # admin.site.register_view django-bootstrap3 # bootstrap layout django-extensions # more commands djangorestframework # dispatch WS API -irc==15.0.6 # core, pinned until I can bother to update --- 17.x has API changes +irc # core parsedatetime # relative date stuff in countdown ply # dice lex/yacc compiler python-dateutil # countdown relative math diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e4f190f..5cf4bc7 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.8 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # pip-compile --output-file=requirements/requirements.txt requirements/requirements.in @@ -28,13 +28,9 @@ djangorestframework==3.14.0 # via -r requirements/requirements.in idna==3.4 # via requests -importlib-resources==5.10.2 - # via jaraco-text inflect==6.0.2 - # via - # jaraco-itertools - # jaraco-text -irc==15.0.6 + # via jaraco-text +irc==20.1.0 # via -r requirements/requirements.in jaraco-classes==3.2.3 # via jaraco-collections @@ -42,13 +38,11 @@ jaraco-collections==3.8.0 # via irc jaraco-context==4.3.0 # via jaraco-text -jaraco-functools==3.5.2 +jaraco-functools==3.6.0 # via # irc # jaraco-text # tempora -jaraco-itertools==6.2.1 - # via irc jaraco-logging==3.1.2 # via irc jaraco-stream==3.0.3 @@ -57,12 +51,11 @@ jaraco-text==3.11.1 # via # irc # jaraco-collections -more-itertools==9.0.0 +more-itertools==9.1.0 # via # irc # jaraco-classes # jaraco-functools - # jaraco-itertools # jaraco-text parsedatetime==2.6 # via -r requirements/requirements.in @@ -90,9 +83,7 @@ requests==2.28.2 requests-toolbelt==0.10.1 # via python-gitlab six==1.16.0 - # via - # irc - # python-dateutil + # via python-dateutil sqlparse==0.4.3 # via django tempora==5.2.1 @@ -105,5 +96,3 @@ urllib3==1.26.14 # via requests zalgo-text==0.6 # via -r requirements/requirements.in -zipp==3.13.0 - # via importlib-resources