summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-12-16 13:16:35 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-12-16 13:16:35 (GMT)
commit928b9e272dae8c0740732a1c01f1bff72ded5ad5 (patch)
treebd45b7f677066186d844c925b8cb98c3ca8befef /Lib
parent593568bf47600154b760edf21f22090ff60a2a74 (diff)
parent808d83d8fdde6bd5d3a0da2302826c69e40fba61 (diff)
downloadcpython-928b9e272dae8c0740732a1c01f1bff72ded5ad5.zip
cpython-928b9e272dae8c0740732a1c01f1bff72ded5ad5.tar.gz
cpython-928b9e272dae8c0740732a1c01f1bff72ded5ad5.tar.bz2
Merge heads
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_devpoll.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_devpoll.py b/Lib/test/test_devpoll.py
index c7bacf8..819d9dc 100644
--- a/Lib/test/test_devpoll.py
+++ b/Lib/test/test_devpoll.py
@@ -4,6 +4,7 @@
import os, select, random, unittest, sys
from test.support import TESTFN, run_unittest
+from _testcapi import USHRT_MAX
try:
select.devpoll