From 118d78a67dc0e94b188b3c75763995b3d2357b76 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Mon, 26 Jan 2015 22:05:38 -0800
Subject: [PATCH] Revert "Enable DeprecationWarnings for Travis-CI even on
 Python 2.7. refs #2366"

This reverts commit cec7727bf980f62ba5e98d11776edb658860e350.

It caused travis (for py2.7) to fail on these tests:

* allmydata.test.test_runner.BinTahoe.test_version_no_noise
* allmydata.test.test_runner.RunNode.test_client_no_noise
* allmydata.test.test_system.SystemTest.test_filesystem_with_cli_in_subprocess
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a47cf5e1..36356b2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ before_install:
 install:
   - pip install 'coveralls==0.4.2'
 before_script: python setup.py build
-script: PYTHONWARNINGS=default::DeprecationWarning bin/tahoe @coverage run --branch --source=src/allmydata @tahoe --version-and-path debug trial --rterrors --reporter=timing
+script: bin/tahoe @coverage run --branch --source=src/allmydata @tahoe --version-and-path debug trial --rterrors --reporter=timing
 after_success:
   coveralls
 notifications:
-- 
2.45.2