diff options
| -rw-r--r-- | Lib/test/test_urllib.py | 79 | ||||
| -rw-r--r-- | Tools/pynche/StripViewer.py | 36 |
2 files changed, 0 insertions, 115 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 3f59c66084..95c4ecc4dc 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -1544,85 +1544,6 @@ class URLopener_Tests(FakeHTTPMixin, unittest.TestCase): self.assertRaises(OSError, DummyURLopener().retrieve, url) -# Just commented them out. -# Can't really tell why keep failing in windows and sparc. -# Everywhere else they work ok, but on those machines, sometimes -# fail in one of the tests, sometimes in other. I have a linux, and -# the tests go ok. -# If anybody has one of the problematic environments, please help! -# . Facundo -# -# def server(evt): -# import socket, time -# serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM) -# serv.settimeout(3) -# serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) -# serv.bind(("", 9093)) -# serv.listen() -# try: -# conn, addr = serv.accept() -# conn.send("1 Hola mundo\n") -# cantdata = 0 -# while cantdata < 13: -# data = conn.recv(13-cantdata) -# cantdata += len(data) -# time.sleep(.3) -# conn.send("2 No more lines\n") -# conn.close() -# except socket.timeout: -# pass -# finally: -# serv.close() -# evt.set() -# -# class FTPWrapperTests(unittest.TestCase): -# -# def setUp(self): -# import ftplib, time, threading -# ftplib.FTP.port = 9093 -# self.evt = threading.Event() -# threading.Thread(target=server, args=(self.evt,)).start() -# time.sleep(.1) -# -# def tearDown(self): -# self.evt.wait() -# -# def testBasic(self): -# # connects -# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) -# ftp.close() -# -# def testTimeoutNone(self): -# # global default timeout is ignored -# import socket -# self.assertIsNone(socket.getdefaulttimeout()) -# socket.setdefaulttimeout(30) -# try: -# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) -# finally: -# socket.setdefaulttimeout(None) -# self.assertEqual(ftp.ftp.sock.gettimeout(), 30) -# ftp.close() -# -# def testTimeoutDefault(self): -# # global default timeout is used -# import socket -# self.assertIsNone(socket.getdefaulttimeout()) -# socket.setdefaulttimeout(30) -# try: -# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, []) -# finally: -# socket.setdefaulttimeout(None) -# self.assertEqual(ftp.ftp.sock.gettimeout(), 30) -# ftp.close() -# -# def testTimeoutValue(self): -# ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, [], -# timeout=30) -# self.assertEqual(ftp.ftp.sock.gettimeout(), 30) -# ftp.close() - - class RequestTests(unittest.TestCase): """Unit tests for urllib.request.Request.""" diff --git a/Tools/pynche/StripViewer.py b/Tools/pynche/StripViewer.py index 2b0ede39ee..6914ca94b2 100644 --- a/Tools/pynche/StripViewer.py +++ b/Tools/pynche/StripViewer.py @@ -371,22 +371,6 @@ class StripViewer: command=self.__togglehex) hexbtn.grid(row=1, column=1, sticky=W) - # XXX: ignore this feature for now; it doesn't work quite right yet - -## gentypevar = self.__gentypevar = IntVar() -## self.__variations = Radiobutton(frame, -## text='Variations', -## variable=gentypevar, -## value=0, -## command=self.__togglegentype) -## self.__variations.grid(row=0, column=1, sticky=W) -## self.__constants = Radiobutton(frame, -## text='Constants', -## variable=gentypevar, -## value=1, -## command=self.__togglegentype) -## self.__constants.grid(row=1, column=1, sticky=W) - # create the white button whitebtn = Button(frame2, text='White', @@ -402,26 +386,6 @@ class StripViewer: red, green, blue = self.__sb.current_rgb() self.update_yourself(red, green, blue) -## def __togglegentype(self, event=None): -## which = self.__gentypevar.get() -## if which == 0: -## self.__reds.set(label='Red Variations', -## generator=constant_cyan_generator) -## self.__greens.set(label='Green Variations', -## generator=constant_magenta_generator) -## self.__blues.set(label='Blue Variations', -## generator=constant_yellow_generator) -## elif which == 1: -## self.__reds.set(label='Red Constant', -## generator=constant_red_generator) -## self.__greens.set(label='Green Constant', -## generator=constant_green_generator) -## self.__blues.set(label='Blue Constant', -## generator=constant_blue_generator) -## else: -## assert 0 -## self.__sb.update_views_current() - def __toblack(self, event=None): self.__sb.update_views(0, 0, 0) |