Kaydet (Commit) 7b71bf38 authored tarafından Georg Brandl's avatar Georg Brandl

Remove usage of sets module (patch #1500609).

üst 83fa22f5
...@@ -11,11 +11,10 @@ not open blocks are not shown in the context hints pane. ...@@ -11,11 +11,10 @@ not open blocks are not shown in the context hints pane.
""" """
import Tkinter import Tkinter
from configHandler import idleConf from configHandler import idleConf
from sets import Set
import re import re
from sys import maxint as INFINITY from sys import maxint as INFINITY
BLOCKOPENERS = Set(["class", "def", "elif", "else", "except", "finally", "for", BLOCKOPENERS = set(["class", "def", "elif", "else", "except", "finally", "for",
"if", "try", "while"]) "if", "try", "while"])
UPDATEINTERVAL = 100 # millisec UPDATEINTERVAL = 100 # millisec
FONTUPDATEINTERVAL = 1000 # millisec FONTUPDATEINTERVAL = 1000 # millisec
......
...@@ -8,7 +8,6 @@ import bsddb ...@@ -8,7 +8,6 @@ import bsddb
import dbhash # Just so we know it's imported import dbhash # Just so we know it's imported
import unittest import unittest
from test import test_support from test import test_support
from sets import Set
class TestBSDDB(unittest.TestCase): class TestBSDDB(unittest.TestCase):
openflag = 'c' openflag = 'c'
...@@ -53,7 +52,7 @@ class TestBSDDB(unittest.TestCase): ...@@ -53,7 +52,7 @@ class TestBSDDB(unittest.TestCase):
self.assertEqual(self.f[k], v) self.assertEqual(self.f[k], v)
def assertSetEquals(self, seqn1, seqn2): def assertSetEquals(self, seqn1, seqn2):
self.assertEqual(Set(seqn1), Set(seqn2)) self.assertEqual(set(seqn1), set(seqn2))
def test_mapping_iteration_methods(self): def test_mapping_iteration_methods(self):
f = self.f f = self.f
......
import unittest import unittest
from test import test_support from test import test_support
import string, StringIO, mimetools, sets import string, StringIO, mimetools
msgtext1 = mimetools.Message(StringIO.StringIO( msgtext1 = mimetools.Message(StringIO.StringIO(
"""Content-Type: text/plain; charset=iso-8859-1; format=flowed """Content-Type: text/plain; charset=iso-8859-1; format=flowed
...@@ -25,7 +25,7 @@ class MimeToolsTest(unittest.TestCase): ...@@ -25,7 +25,7 @@ class MimeToolsTest(unittest.TestCase):
self.assertEqual(o.getvalue(), start) self.assertEqual(o.getvalue(), start)
def test_boundary(self): def test_boundary(self):
s = sets.Set([""]) s = set([""])
for i in xrange(100): for i in xrange(100):
nb = mimetools.choose_boundary() nb = mimetools.choose_boundary()
self.assert_(nb not in s) self.assert_(nb not in s)
......
import mimetypes import mimetypes
import StringIO import StringIO
import unittest import unittest
from sets import Set
from test import test_support from test import test_support
...@@ -52,8 +51,8 @@ class MimeTypesTestCase(unittest.TestCase): ...@@ -52,8 +51,8 @@ class MimeTypesTestCase(unittest.TestCase):
# First try strict. Use a set here for testing the results because if # First try strict. Use a set here for testing the results because if
# test_urllib2 is run before test_mimetypes, global state is modified # test_urllib2 is run before test_mimetypes, global state is modified
# such that the 'all' set will have more items in it. # such that the 'all' set will have more items in it.
all = Set(self.db.guess_all_extensions('text/plain', strict=True)) all = set(self.db.guess_all_extensions('text/plain', strict=True))
unless(all >= Set(['.bat', '.c', '.h', '.ksh', '.pl', '.txt'])) unless(all >= set(['.bat', '.c', '.h', '.ksh', '.pl', '.txt']))
# And now non-strict # And now non-strict
all = self.db.guess_all_extensions('image/jpg', strict=False) all = self.db.guess_all_extensions('image/jpg', strict=False)
all.sort() all.sort()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment