diff --git a/.gitignore b/.gitignore index e83cfc0..83bbfdc 100644 --- a/.gitignore +++ b/.gitignore @@ -104,4 +104,4 @@ ENV/ config/config.ini config/config.toml *.sqlite -*.sqlite-journal \ No newline at end of file +*.sqlite-journal diff --git a/core.py b/core.py index 6f6119b..de2c03a 100644 --- a/core.py +++ b/core.py @@ -1,11 +1,9 @@ import logging -import os -import sys +import os, sys import threading import sqlalchemy import sqlalchemy.ext.declarative as sed -import sqlalchemy.orm import telegram import database diff --git a/database.py b/database.py index c5e6298..2fab295 100644 --- a/database.py +++ b/database.py @@ -5,7 +5,7 @@ import requests import telegram from sqlalchemy import Column, ForeignKey, UniqueConstraint from sqlalchemy import Integer, BigInteger, String, Text, LargeBinary, DateTime, Boolean -from sqlalchemy.ext.declarative import declarative_base, DeferredReflection +from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import relationship, backref import utils diff --git a/duckbot.py b/duckbot.py index b36a786..9e5adc4 100644 --- a/duckbot.py +++ b/duckbot.py @@ -1,6 +1,5 @@ import logging -import sys -import time +import sys, time import traceback import telegram.error diff --git a/worker.py b/worker.py index 541553c..5da62bc 100644 --- a/worker.py +++ b/worker.py @@ -1,9 +1,9 @@ +import os +import sys import datetime import logging -import os import queue as queuem import re -import sys import threading import traceback import uuid @@ -11,7 +11,7 @@ from html import escape from typing import * import requests -import sqlalchemy.orm +import sqlalchemy import telegram import database as db