diff options
| author | Georg Brandl <georg@python.org> | 2014-03-02 07:54:15 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-02 07:54:15 (GMT) |
| commit | 2658bad090f47aec4982af5480f2f8491f87f843 (patch) | |
| tree | 76baae944214ebdf245de28f1e329e5cd60983ac /Lib | |
| parent | 9e90b12bb255de186400a8576c784c4443963876 (diff) | |
| parent | b772b03194dd42798c4f0d5cbd9a1a2b24bc89da (diff) | |
| download | cpython-2658bad090f47aec4982af5480f2f8491f87f843.zip cpython-2658bad090f47aec4982af5480f2f8491f87f843.tar.gz cpython-2658bad090f47aec4982af5480f2f8491f87f843.tar.bz2 | |
merge 3.3.5rc1 release commits with 3.3 branch
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/__init__.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/idlever.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_robotparser.py | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py index de5560b..b79071a 100644 --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -13,5 +13,5 @@ used from a setup script as # Updated automatically by the Python release process. # #--start constants-- -__version__ = "3.3.4" +__version__ = "3.3.5rc1" #--end constants-- diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py index e9e88ef..4cd9862 100644 --- a/Lib/idlelib/idlever.py +++ b/Lib/idlelib/idlever.py @@ -1 +1 @@ -IDLE_VERSION = "3.3.4" +IDLE_VERSION = "3.3.5rc1" diff --git a/Lib/test/test_robotparser.py b/Lib/test/test_robotparser.py index d1dfd9e..ebc819c 100644 --- a/Lib/test/test_robotparser.py +++ b/Lib/test/test_robotparser.py @@ -275,6 +275,7 @@ class NetworkTestCase(unittest.TestCase): self.skipTest('%s is unavailable' % url) self.assertEqual(parser.can_fetch("*", robots_url), False) + @unittest.skip('does not handle the gzip encoding delivered by pydotorg') def testPythonOrg(self): support.requires('network') with support.transient_internet('www.python.org'): |