From 1a7cd93a4172ecf88c152a507cd8a8704d2f6780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E8=B6=85=E8=B6=85?= Date: Thu, 23 Jul 2020 21:05:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=200003-Rev?= =?UTF-8?q?ert-IPSet-doesn-t-need-MutableSet-inheritance.-Tr.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sn-t-need-MutableSet-inheritance.-Tr.patch | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 0003-Revert-IPSet-doesn-t-need-MutableSet-inheritance.-Tr.patch diff --git a/0003-Revert-IPSet-doesn-t-need-MutableSet-inheritance.-Tr.patch b/0003-Revert-IPSet-doesn-t-need-MutableSet-inheritance.-Tr.patch deleted file mode 100644 index f8d6b04..0000000 --- a/0003-Revert-IPSet-doesn-t-need-MutableSet-inheritance.-Tr.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 29c6ebe53f02a5dba4f4d397b5a5d69682fe5471 Mon Sep 17 00:00:00 2001 -From: Jeff Ferland -Date: Tue, 30 Apr 2013 16:05:33 -0700 -Subject: [PATCH 03/35] Revert "IPSet doesn't **need** MutableSet inheritance. - Try/catch it." - -This reverts commit 4d6fbf91a50a2ebc24ff01d3406232d1666677ec. -We can't make IPSet work without various collections, so just use them all. ---- - IPy.py | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/IPy.py b/IPy.py -index 0e17aab..60f7a43 100644 ---- a/IPy.py -+++ b/IPy.py -@@ -1016,12 +1016,7 @@ class IP(IPint): - raise ValueError("%s cannot be converted to an IPv4 address." - % repr(self)) - --try: -- IPSetBaseClass = collections.MutableSet --except AttributeError: -- IPSetBaseClass = object -- --class IPSet(IPSetBaseClass): -+class IPSet(collections.MutableSet): - def __init__(self, iterable=[]): - # Make sure it's iterable, otherwise wrap - if not isinstance(iterable, collections.Iterable): --- -1.8.3.1 -