From c8bf79c202c6e3c7d31d3f8b95cdb42af52eda92 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Sat, 20 Feb 2016 19:32:53 -0400 Subject: [PATCH] Replace ABCMeta with just ABC --- aiohttp/abc.py | 8 ++++---- aiohttp/protocol.py | 4 ++-- aiohttp/web_urldispatcher.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/aiohttp/abc.py b/aiohttp/abc.py index 1e0faa471b3..39218e40891 100644 --- a/aiohttp/abc.py +++ b/aiohttp/abc.py @@ -1,12 +1,12 @@ import asyncio import sys -from abc import ABCMeta, abstractmethod +from abc import ABC, abstractmethod PY_35 = sys.version_info >= (3, 5) -class AbstractRouter(metaclass=ABCMeta): +class AbstractRouter(ABC): @asyncio.coroutine # pragma: no branch @abstractmethod @@ -14,7 +14,7 @@ def resolve(self, request): """Return MATCH_INFO for given request""" -class AbstractMatchInfo(metaclass=ABCMeta): +class AbstractMatchInfo(ABC): @asyncio.coroutine # pragma: no branch @abstractmethod @@ -36,7 +36,7 @@ def get_info(self): """Return a dict with additional info useful for introspection""" -class AbstractView(metaclass=ABCMeta): +class AbstractView(ABC): def __init__(self, request): self._request = request diff --git a/aiohttp/protocol.py b/aiohttp/protocol.py index b22fd923de9..2928f90aa7c 100644 --- a/aiohttp/protocol.py +++ b/aiohttp/protocol.py @@ -7,7 +7,7 @@ import string import sys import zlib -from abc import abstractmethod, ABCMeta +from abc import abstractmethod, ABC from wsgiref.handlers import format_date_time import aiohttp @@ -481,7 +481,7 @@ def filter_pipe(filter, filter2, *, chunk = yield EOL_MARKER -class HttpMessage(metaclass=ABCMeta): +class HttpMessage(ABC): """HttpMessage allows to write headers and payload to a stream. For example, lets say we want to read file then compress it with deflate diff --git a/aiohttp/web_urldispatcher.py b/aiohttp/web_urldispatcher.py index e9e57ed9ff5..e7361463012 100644 --- a/aiohttp/web_urldispatcher.py +++ b/aiohttp/web_urldispatcher.py @@ -66,7 +66,7 @@ def _append_query(url, query): return url -class AbstractRoute(metaclass=abc.ABCMeta): +class AbstractRoute(abc.ABC): METHODS = hdrs.METH_ALL | {hdrs.METH_ANY} def __init__(self, method, handler, *,