From c9b1fa2aa59236c8d33887c3cbbd1cfa4fc3a097 Mon Sep 17 00:00:00 2001 From: "Amber Brown (HawkOwl)" Date: Sun, 25 Sep 2016 18:57:41 +0800 Subject: [PATCH] once more... with... feeling? --- .travis/run.sh | 5 +---- src/twisted/internet/cfreactor.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis/run.sh b/.travis/run.sh index 1a2c40a45a8..dbb3f3c4722 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -2,9 +2,6 @@ set -e set -x -if [[ "$(uname -s)" == "Darwin" ]]; then - # Initialize the virtualenv created at install time. - source ~/.venv/bin/activate -fi +echo $PATH tox -- $TOX_FLAGS diff --git a/src/twisted/internet/cfreactor.py b/src/twisted/internet/cfreactor.py index 29af40b932f..2568807da82 100644 --- a/src/twisted/internet/cfreactor.py +++ b/src/twisted/internet/cfreactor.py @@ -224,7 +224,7 @@ def _watchFD(self, fd, descr, flag): kCFAllocatorDefault, fd, kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack, - self._socketCallback, ctx + lambda *a: log.callWithLogger(self._socketCallback, *a), ctx ) CFSocketSetSocketFlags( cfs,