summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2017-07-25 09:05:42 (GMT)
committerLarry Hastings <larry@hastings.org>2017-07-25 09:05:42 (GMT)
commita6284785da89b4af0664f4f76b7ea43b8f7abb74 (patch)
treecb1f526827ee81bb63df21eaa0dbca787a46784e /Lib
parent385b3686ff87da838af03b219540d704335f2bc6 (diff)
parent157b6ad677b7b330d30b2bb5ffbb2edac77b78cb (diff)
downloadcpython-a6284785da89b4af0664f4f76b7ea43b8f7abb74.zip
cpython-a6284785da89b4af0664f4f76b7ea43b8f7abb74.tar.gz
cpython-a6284785da89b4af0664f4f76b7ea43b8f7abb74.tar.bz2
Merge main 3.5 branch into 3.5.4rc1.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_os.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 8ad6d8e..bb5d2e3 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -2443,6 +2443,7 @@ class TestSendfile(unittest.TestCase):
self.client.close()
if self.server.running:
self.server.stop()
+ self.server = None
def sendfile_wrapper(self, sock, file, offset, nbytes, headers=[], trailers=[]):
"""A higher level wrapper representing how an application is