From 4f45ac71aa8e1aa97007c6da4f12f7c159b24a36 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 31 Jul 2015 17:59:13 +0200 Subject: Use compat.PY34 --- asyncio/base_events.py | 3 ++- asyncio/base_subprocess.py | 4 ++-- asyncio/proactor_events.py | 4 ++-- asyncio/selector_events.py | 4 ++-- asyncio/sslproto.py | 4 ++-- asyncio/unix_events.py | 5 +++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/asyncio/base_events.py b/asyncio/base_events.py index 5a536a2..8e4ad4f 100644 --- a/asyncio/base_events.py +++ b/asyncio/base_events.py @@ -28,6 +28,7 @@ import traceback import sys import warnings +from . import compat from . import coroutines from . import events from . import futures @@ -378,7 +379,7 @@ class BaseEventLoop(events.AbstractEventLoop): # On Python 3.3 and older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks # to the PEP 442. - if sys.version_info >= (3, 4): + if compat.PY34: def __del__(self): if not self.is_closed(): warnings.warn("unclosed event loop %r" % self, ResourceWarning) diff --git a/asyncio/base_subprocess.py b/asyncio/base_subprocess.py index a6971b1..6851cd2 100644 --- a/asyncio/base_subprocess.py +++ b/asyncio/base_subprocess.py @@ -1,8 +1,8 @@ import collections import subprocess -import sys import warnings +from . import compat from . import futures from . import protocols from . import transports @@ -116,7 +116,7 @@ class BaseSubprocessTransport(transports.SubprocessTransport): # On Python 3.3 and older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks # to the PEP 442. - if sys.version_info >= (3, 4): + if compat.PY34: def __del__(self): if not self._closed: warnings.warn("unclosed transport %r" % self, ResourceWarning) diff --git a/asyncio/proactor_events.py b/asyncio/proactor_events.py index 9c2b8f1..abe4c12 100644 --- a/asyncio/proactor_events.py +++ b/asyncio/proactor_events.py @@ -7,10 +7,10 @@ proactor is only implemented on Windows with IOCP. __all__ = ['BaseProactorEventLoop'] import socket -import sys import warnings from . import base_events +from . import compat from . import constants from . import futures from . import sslproto @@ -79,7 +79,7 @@ class _ProactorBasePipeTransport(transports._FlowControlMixin, # On Python 3.3 and older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks # to the PEP 442. - if sys.version_info >= (3, 4): + if compat.PY34: def __del__(self): if self._sock is not None: warnings.warn("unclosed transport %r" % self, ResourceWarning) diff --git a/asyncio/selector_events.py b/asyncio/selector_events.py index 7c5b9b5..4a99658 100644 --- a/asyncio/selector_events.py +++ b/asyncio/selector_events.py @@ -10,7 +10,6 @@ import collections import errno import functools import socket -import sys import warnings try: import ssl @@ -18,6 +17,7 @@ except ImportError: # pragma: no cover ssl = None from . import base_events +from . import compat from . import constants from . import events from . import futures @@ -568,7 +568,7 @@ class _SelectorTransport(transports._FlowControlMixin, # On Python 3.3 and older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks # to the PEP 442. - if sys.version_info >= (3, 4): + if compat.PY34: def __del__(self): if self._sock is not None: warnings.warn("unclosed transport %r" % self, ResourceWarning) diff --git a/asyncio/sslproto.py b/asyncio/sslproto.py index 235855e..e566946 100644 --- a/asyncio/sslproto.py +++ b/asyncio/sslproto.py @@ -1,11 +1,11 @@ import collections -import sys import warnings try: import ssl except ImportError: # pragma: no cover ssl = None +from . import compat from . import protocols from . import transports from .log import logger @@ -317,7 +317,7 @@ class _SSLProtocolTransport(transports._FlowControlMixin, # On Python 3.3 and older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks # to the PEP 442. - if sys.version_info >= (3, 4): + if compat.PY34: def __del__(self): if not self._closed: warnings.warn("unclosed transport %r" % self, ResourceWarning) diff --git a/asyncio/unix_events.py b/asyncio/unix_events.py index 75e7c9c..bf3b084 100644 --- a/asyncio/unix_events.py +++ b/asyncio/unix_events.py @@ -13,6 +13,7 @@ import warnings from . import base_events from . import base_subprocess +from . import compat from . import constants from . import coroutines from . import events @@ -370,7 +371,7 @@ class _UnixReadPipeTransport(transports.ReadTransport): # On Python 3.3 and older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks # to the PEP 442. - if sys.version_info >= (3, 4): + if compat.PY34: def __del__(self): if self._pipe is not None: warnings.warn("unclosed transport %r" % self, ResourceWarning) @@ -555,7 +556,7 @@ class _UnixWritePipeTransport(transports._FlowControlMixin, # On Python 3.3 and older, objects with a destructor part of a reference # cycle are never destroyed. It's not more the case on Python 3.4 thanks # to the PEP 442. - if sys.version_info >= (3, 4): + if compat.PY34: def __del__(self): if self._pipe is not None: warnings.warn("unclosed transport %r" % self, ResourceWarning) -- cgit v1.2.1