From 41fe6155394edf0ef65d125b27ceb8d1e37f72d3 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Fri, 2 Apr 2010 18:52:12 +0000 Subject: (partially) Merged revisions 79534,79537,79539,79558,79606 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines Fix test for xml.etree when using a non-ascii path. And use check_warnings instead of catch_warnings. ........ r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines Fix typo ........ r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests. ........ r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote. ........ r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines Backport some robotparser test and skip the test if the external resource is not available. ........ --- Lib/test/test_descr.py | 1 - 1 file changed, 1 deletion(-) (limited to 'Lib/test/test_descr.py') diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 408f72b0a9..5568dd5e27 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -2,7 +2,6 @@ import builtins import sys import types import unittest -import warnings from copy import deepcopy from test import support -- cgit v1.2.1