[Python-checkins] Remove code commented for more than 10 years (GH-16965)
Victor Stinner
webhook-mailer at python.org
Mon Oct 28 17:35:35 EDT 2019
https://github.com/python/cpython/commit/ae7aa4277437566b55aa6941d8d50cce35848ace
commit: ae7aa4277437566b55aa6941d8d50cce35848ace
branch: master
author: Victor Stinner <vstinner at python.org>
committer: GitHub <noreply at github.com>
date: 2019-10-28T22:35:31+01:00
summary:
Remove code commented for more than 10 years (GH-16965)
test_urllib commented since 2007:
commit d9880d07fc032884e8bd5cf3ac636d3a3778d5f7
Author: Facundo Batista <facundobatista at gmail.com>
Date: Fri May 25 04:20:22 2007 +0000
Commenting out the tests until find out who can test them in
one of the problematic enviroments.
pynche code commented since 1998 and 2001:
commit ef30092207e684bd3e74fe3d6172b97327a0a089
Author: Barry Warsaw <barry at python.org>
Date: Tue Dec 15 01:04:38 1998 +0000
Added most of the mechanism to change the strips from color variations
to color constants (i.e. red constant, green constant, blue
constant). But I haven't hooked this up yet because the UI gets more
crowded and the arrows don't reflect the correct values.
Added "Go to Black" and "Go to White" buttons.
commit 741eae0b3129c123ed4319d8d9e5b877b09aefa8
Author: Barry Warsaw <barry at python.org>
Date: Wed Apr 18 03:51:55 2001 +0000
StripWidget.__init__(), update_yourself(): Removed some unused local
variables reported by PyChecker.
__togglegentype(): PyChecker accurately reported that the variable
__gentypevar was unused -- actually this whole method is currently
unused so comment it out.
files:
M Lib/test/test_urllib.py
M Tools/pynche/StripViewer.py
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 3f59c66084593..95c4ecc4dcf29 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -1544,85 +1544,6 @@ def open_local_file(self, url):
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 2b0ede39eeeff..6914ca94b2bd3 100644
--- a/Tools/pynche/StripViewer.py
+++ b/Tools/pynche/StripViewer.py
@@ -371,22 +371,6 @@ def __init__(self, switchboard, master=None):
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 @@ def __togglehex(self, event=None):
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)
More information about the Python-checkins
mailing list