Merge pull request #1082 from benoitc/travis-container-based

Use the travis container-based infrastructure
This commit is contained in:
Berker Peksag 2015-07-14 01:40:42 +03:00
commit 97428ed083
2 changed files with 2 additions and 1 deletions

View File

@ -1,3 +1,4 @@
sudo: false
language: python
env:
- TOXENV=py26

View File

@ -381,7 +381,7 @@ class ScalableSelectorMixIn:
for i in range(NUM_FDS // 2):
try:
rd, wr = self.make_socketpair()
except OSError:
except (IOError, OSError):
# too many FDs, skip - note that we should only catch EMFILE
# here, but apparently *BSD and Solaris can fail upon connect()
# or bind() with EADDRNOTAVAIL, so let's be safe