Commit 70c61625 authored by Jason Madden's avatar Jason Madden

Temporarily drop cython from the dep list and try develop for travis.

parent 72cda414
...@@ -14,6 +14,6 @@ install: ...@@ -14,6 +14,6 @@ install:
- travis_retry pip install --install-option='--no-cython-compile' cython - travis_retry pip install --install-option='--no-cython-compile' cython
script: script:
# Try to use the site packages of cython we just installed # Try to use the site packages of cython we just installed
- tox --sitepackages - tox --sitepackages --develop
notifications: notifications:
email: false email: false
...@@ -296,10 +296,12 @@ class socket(object): ...@@ -296,10 +296,12 @@ class socket(object):
timeleft = self.timeout timeleft = self.timeout
end = time.time() + timeleft end = time.time() + timeleft
data_sent = 0 data_sent = 0
trips = 0
while True: while True:
trips += 1
data_sent += self.send(_get_memory(data, data_sent), flags, timeout=timeleft) data_sent += self.send(_get_memory(data, data_sent), flags, timeout=timeleft)
if data_sent >= len(data): if data_sent >= len(data):
return data_sent, 'timeout', self.timeout return data_sent, 'timeout', self.timeout, trips
timeleft = end - time.time() timeleft = end - time.time()
if timeleft <= 0: if timeleft <= 0:
raise timeout('timed out') raise timeout('timed out')
......
...@@ -5,7 +5,7 @@ envlist = ...@@ -5,7 +5,7 @@ envlist =
[testenv] [testenv]
deps = deps =
greenlet greenlet
cython # cython
whitelist_externals = whitelist_externals =
* *
commands = commands =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment