python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-12 10:11:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove func filter

Browse source
This commit is contained in:
Alex RootJunior 2019-04-18 21:30:02 +03:00
parent 65a1659345
commit 7236541723
3 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
aiogram/dispatcher/dispatcher.py
View file

@ -8,7 +8,7 @@ import typing
import aiohttp import aiohttp
from aiohttp.helpers import sentinel from aiohttp.helpers import sentinel
from .filters import Command, ContentTypeFilter, ExceptionsFilter, FiltersFactory, FuncFilter, HashTag, Regexp, \ from .filters import Command, ContentTypeFilter, ExceptionsFilter, FiltersFactory, HashTag, Regexp, \
RegexpCommandsFilter, StateFilter, Text RegexpCommandsFilter, StateFilter, Text
from .handler import Handler from .handler import Handler
from .middlewares import MiddlewareManager from .middlewares import MiddlewareManager
@ -114,9 +114,6 @@ class Dispatcher(DataMixin, ContextInstanceMixin):
filters_factory.bind(ExceptionsFilter, event_handlers=[ filters_factory.bind(ExceptionsFilter, event_handlers=[
self.errors_handlers self.errors_handlers
]) ])
filters_factory.bind(FuncFilter, exclude_event_handlers=[
self.errors_handlers
])
def __del__(self): def __del__(self):
self.stop_polling() self.stop_polling()

3
aiogram/dispatcher/filters/__init__.py
View file

@ -1,5 +1,5 @@
from .builtin import Command, CommandHelp, CommandPrivacy, CommandSettings, CommandStart, ContentTypeFilter, \ from .builtin import Command, CommandHelp, CommandPrivacy, CommandSettings, CommandStart, ContentTypeFilter, \
ExceptionsFilter, FuncFilter, HashTag, Regexp, RegexpCommandsFilter, StateFilter, Text ExceptionsFilter, HashTag, Regexp, RegexpCommandsFilter, StateFilter, Text
from .factory import FiltersFactory from .factory import FiltersFactory
from .filters import AbstractFilter, BoundFilter, Filter, FilterNotPassed, FilterRecord, execute_filter, \ from .filters import AbstractFilter, BoundFilter, Filter, FilterNotPassed, FilterRecord, execute_filter, \
check_filters, get_filter_spec, get_filters_spec check_filters, get_filter_spec, get_filters_spec
@ -15,7 +15,6 @@ __all__ = [
'ContentTypeFilter', 'ContentTypeFilter',
'ExceptionsFilter', 'ExceptionsFilter',
'HashTag', 'HashTag',
'FuncFilter',
'Filter', 'Filter',
'FilterNotPassed', 'FilterNotPassed',
'FilterRecord', 'FilterRecord',

16
aiogram/dispatcher/filters/builtin.py
View file

@ -398,22 +398,6 @@ class StateFilter(BoundFilter):
return False return False
class FuncFilter(BoundFilter):
key = 'func'
def __init__(self, dispatcher, func):
self.dispatcher = dispatcher
self.func = func
warn_deprecated('"func" filter will be removed in 2.1 version.\n'
'Read mode: https://aiogram.readthedocs.io/en/dev-2.x/migration_1_to_2.html#custom-filters',
stacklevel=8)
async def check(self, obj) -> bool:
from .filters import check_filter
return await check_filter(self.dispatcher, self.func, (obj,))
class ExceptionsFilter(BoundFilter): class ExceptionsFilter(BoundFilter):
""" """
Filter for exceptions Filter for exceptions