From f90f5d5c1d95721e0ca0b1c302e3d13ed34753a8 Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Thu, 17 May 2018 01:16:12 -0700 Subject: bpo-33549: Remove shim and deprecation warning to access DocumentLS.async. (GH-6924) `obj.async` is now a syntax error, so the warning/shim is quasi-unnecessary. --- Lib/test/test_minidom.py | 10 ---------- Lib/xml/dom/xmlbuilder.py | 22 ---------------------- 2 files changed, 32 deletions(-) diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py index ee8c041..a2cc882 100644 --- a/Lib/test/test_minidom.py +++ b/Lib/test/test_minidom.py @@ -60,17 +60,7 @@ class MinidomTest(unittest.TestCase): def testDocumentAsyncAttr(self): doc = Document() self.assertFalse(doc.async_) - with self.assertWarns(DeprecationWarning): - self.assertFalse(getattr(doc, 'async', True)) - with self.assertWarns(DeprecationWarning): - setattr(doc, 'async', True) - with self.assertWarns(DeprecationWarning): - self.assertTrue(getattr(doc, 'async', False)) - self.assertTrue(doc.async_) - self.assertFalse(Document.async_) - with self.assertWarns(DeprecationWarning): - self.assertFalse(getattr(Document, 'async', True)) def testParseFromBinaryFile(self): with open(tstfile, 'rb') as file: diff --git a/Lib/xml/dom/xmlbuilder.py b/Lib/xml/dom/xmlbuilder.py index 60a2bc3..213ab14 100644 --- a/Lib/xml/dom/xmlbuilder.py +++ b/Lib/xml/dom/xmlbuilder.py @@ -332,29 +332,10 @@ class DOMBuilderFilter: del NodeFilter -class _AsyncDeprecatedProperty: - def warn(self, cls): - clsname = cls.__name__ - warnings.warn( - "{cls}.async is deprecated; use {cls}.async_".format(cls=clsname), - DeprecationWarning) - - def __get__(self, instance, cls): - self.warn(cls) - if instance is not None: - return instance.async_ - return False - - def __set__(self, instance, value): - self.warn(type(instance)) - setattr(instance, 'async_', value) - - class DocumentLS: """Mixin to create documents that conform to the load/save spec.""" async_ = False - locals()['async'] = _AsyncDeprecatedProperty() # Avoid DeprecationWarning def _get_async(self): return False @@ -384,9 +365,6 @@ class DocumentLS: return snode.toxml() -del _AsyncDeprecatedProperty - - class DOMImplementationLS: MODE_SYNCHRONOUS = 1 MODE_ASYNCHRONOUS = 2 -- cgit v0.12