Commit Graph

30608 Commits

Author SHA1 Message Date
Senthil Kumaran 2f01e239cb Issue #16702: Skip proxies for localhost in urllib2_localnet tests 2012-12-26 01:45:22 -08:00
Gregory P. Smith a689e524e7 Test for issue16772 and redoes the previous fix to accept __index__-aware
objects as the base by using PyNumber_AsSsize_t similar to round().
2012-12-25 22:38:32 -08:00
Kristján Valur Jónsson 36852b7844 Issue #14574: Ignore socket errors raised when flushing a connection on close. 2012-12-25 22:46:32 +00:00
Kristján Valur Jónsson b0d1c37d73 Issue #14574: Ignore socket errors raised when flushing a connection on close. 2012-12-25 22:46:32 +00:00
Andrew Svetlov f7a17b48d7 Replace IOError with OSError (#16715) 2012-12-25 16:47:37 +02:00
Kristján Valur Jónsson 2380feeff8 issue #879399
Fix line buffering of socket._fileobject
2012-12-25 13:04:50 +00:00
Ezio Melotti 94704fc25b #16765: remove unused import. 2012-12-25 14:25:47 +02:00
Andrew Svetlov 914ab8420e Add test coverage for os.removedirs (#16775) 2012-12-25 12:21:49 +02:00
Andrew Svetlov 34dcdee177 Add test coverage for os.removedirs (#16775) 2012-12-25 12:20:39 +02:00
Andrew Svetlov 405faed511 Add test coverage for os.removedirs (#16775) 2012-12-25 12:18:09 +02:00
Senthil Kumaran 750909e618 Fix issue16713 - tel url parsing with params 2012-12-24 14:01:48 -08:00
Senthil Kumaran bd6667aae3 Fix issue16713 - tel url parsing with params 2012-12-24 14:01:13 -08:00
Senthil Kumaran ed30199e78 Fix issue16713 - tel url parsing with params 2012-12-24 14:00:20 -08:00
Senthil Kumaran 1974baadc6 Fix issue16713 - tel url parsing with params 2012-12-24 13:56:54 -08:00
Andrew Svetlov 2552bc0601 fix typo (#16720) 2012-12-24 21:47:24 +02:00
Andrew Svetlov 332562f447 Keep ref to ECHILD in local scope (#16650) 2012-12-24 20:09:27 +02:00
Andrew Svetlov 1d960fe4c4 Keep ref to ECHILD in local scope (#16650) 2012-12-24 20:08:53 +02:00
Andrew Svetlov 5b187ce700 Keep ref to ECHILD in local scope (#16650) 2012-12-24 20:06:52 +02:00
Andrew Svetlov 08bab07291 Keep ref to ECHILD in local scope (#16650) 2012-12-24 20:06:35 +02:00
Andrew Svetlov 8b33dd8e54 Use OESeeror instead of os.error (#16720)
Patch by Serhiy Storchaka.
2012-12-24 19:58:48 +02:00
Mark Dickinson 9fade768c8 Issue #13863: fix incorrect .pyc timestamps on Windows / NTFS (apparently due to buggy fstat) 2012-12-24 16:33:18 +00:00
Andrew Svetlov d8590ff209 Issue #16511: Use default IDLE width and height if config param is not valid.
Patch Serhiy Storchaka.
2012-12-24 13:17:59 +02:00
Andrew Svetlov 6a7a49c631 Issue #16511: Use default IDLE width and height if config param is not valid.
Patch Serhiy Storchaka.
2012-12-24 13:17:11 +02:00
Andrew Svetlov 7174f0883c Issue #16511: Use default IDLE width and height if config param is not valid.
Patch Serhiy Storchaka.
2012-12-24 13:16:47 +02:00
Andrew Svetlov 8a495a48a5 Issue #16511: Use default IDLE width and height if config param is not valid.
Patch Serhiy Storchaka.
2012-12-24 13:15:43 +02:00
Brian Curtin 445ad997ab Fix #14470. Remove w9xpopen per PEP 11.
As stated in PEP 11, 3.4 removes code on Windows platforms where
COMSPEC points to command.com. The w9xpopen project in Visual Studio
was added to support that case, and there was a special case in subprocess
to cover that situation. This change removes the w9xpopen project from
the Visual Studio solution and removes any references to the w9xpopen
executable.
2012-12-23 16:53:21 -06:00
Senthil Kumaran 0a6b9eca68 merge from 3.2
Fix Issue15701 - HTTPError info method call raises AttributeError. Fix that to return headers correctly
2012-12-23 09:12:13 -08:00
Senthil Kumaran 41e66a26b0 Fix Issue15701 - HTTPError info method call raises AttributeError. Fix that to return headers correctly 2012-12-23 09:04:24 -08:00
Senthil Kumaran f8a6b005fd Fix Issue15701 - HTTPError info method call raises AttributeError. Fix that to return headers correctly 2012-12-23 09:00:47 -08:00
Andrew Svetlov 2cd8ce4690 Issue #9856: Replace deprecation warinigs to raising TypeError in object.__format__
Patch by Florent Xicluna.
2012-12-23 14:27:17 +02:00
Andrew Svetlov f347cf903c merge heads 2012-12-23 12:51:40 +02:00
Andrew Svetlov 4b61d0fa7f Issue #16045: add more unit tests for built-in int()
Patch by Chris Jerdonek.
2012-12-23 12:50:02 +02:00
Andrew Svetlov 8e42e8a0c6 Issue #16045: add more unit tests for built-in int()
Patch by Chris Jerdonek.
2012-12-23 12:49:33 +02:00
Andrew Svetlov cddcafaf6b Issue #16045: add more unit tests for built-in int()
Patch by Chris Jerdonek.
2012-12-23 12:44:04 +02:00
Brett Cannon 2909d6b47c merge with 3.3 2012-12-22 19:38:32 -05:00
Brett Cannon 73b969ec70 Issue #16752: Add a missing import to modulefinder.
Also fix Misc/ACKS to put part of it back in alphabetical order and
remove some duplicate names.

Patch by Berker Peksag.
2012-12-22 19:34:21 -05:00
Petri Lehtinen ab7dd183f3 #8853: Allow port to be of type long for socket.getaddrinfo() 2012-12-20 21:09:56 +02:00
Benjamin Peterson a2d6d7121e call close on the underlying stream even if flush raises (#16597) 2012-12-20 12:24:10 -06:00
Benjamin Peterson 4c05969fc4 merge 3.3 (#16597) 2012-12-20 11:55:16 -06:00
Benjamin Peterson 68623614f0 call close on the underlying stream even if flush raises (closes #16597)
Patch by Serhiy Storchaka.
2012-12-20 11:53:11 -06:00
Benjamin Peterson 7643c92cdd merge 3.3 (#16722) 2012-12-19 15:28:46 -06:00
Benjamin Peterson 5ff3f73d94 try to call __bytes__ before __index__ (closes #16722) 2012-12-19 15:27:41 -06:00
Andrew Svetlov fd43b4d3e4 replace threw with raised (#16714) 2012-12-19 22:55:40 +02:00
Andrew Svetlov 1f415cf2c2 replace threw with raised (#16714) 2012-12-19 22:54:47 +02:00
Andrew Svetlov 7bd61cbc03 replace threw with raised (#16714) 2012-12-19 22:49:25 +02:00
Andrew Svetlov bacf1bf355 replace threw with raised (#16714) 2012-12-19 22:49:01 +02:00
Andrew Svetlov bd644608bd revert comment wording (#16714) 2012-12-19 22:47:05 +02:00
Antoine Pitrou aa03a1fe2a Small cleanup in test_ftplib 2012-12-19 20:44:37 +01:00
Antoine Pitrou 08d02724df Small cleanup in test_ftplib 2012-12-19 20:44:02 +01:00
Andrew Svetlov 2606a6f197 Issue #16719: Get rid of WindowsError. Use OSError instead
Patch by Serhiy Storchaka.
2012-12-19 14:33:35 +02:00
Antoine Pitrou f23e3f7ad2 Silence sporadic failure in RecvmsgIntoSCTPStreamTest.testRecvmsgEOF (issue #13876) - probably not Python-related. 2012-12-18 23:44:59 +01:00
Antoine Pitrou d5a070f586 Silence sporadic failure in RecvmsgIntoSCTPStreamTest.testRecvmsgEOF (issue #13876) - probably not Python-related. 2012-12-18 23:44:36 +01:00
Antoine Pitrou dcac718236 Call importlib.invalidate_caches() after creating module files in test_threaded_import. 2012-12-18 23:28:24 +01:00
Antoine Pitrou 07edb82e4b Call importlib.invalidate_caches() after creating module files in test_threaded_import. 2012-12-18 23:28:04 +01:00
Antoine Pitrou 1688812894 Try to make test_threaded_import faster and safer (issue #15599). 2012-12-18 23:04:10 +01:00
Antoine Pitrou e0b1c23145 Try to make test_threaded_import faster and safer (issue #15599). 2012-12-18 23:03:42 +01:00
Antoine Pitrou ad8c461e2c Add sanity assertions in some import lock code (issue #15599). 2012-12-18 22:18:58 +01:00
Antoine Pitrou 202b60640b Add sanity assertions in some import lock code (issue #15599). 2012-12-18 22:18:17 +01:00
Andrew Svetlov 0832af6628 Issue #16717: get rid of socket.error, replace with OSError 2012-12-18 23:10:48 +02:00
Andrew Svetlov ad28c7f9da Issue #16706: get rid of os.error 2012-12-18 22:02:39 +02:00
Andrew Svetlov 4bb142b1b7 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:27:37 +02:00
Andrew Svetlov a191959849 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:27:16 +02:00
Andrew Svetlov 5b89840d9c Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:26:36 +02:00
Andrew Svetlov 737fb89dd1 Issue #16714: use 'raise' exceptions, don't 'throw'.
Patch by Serhiy Storchaka.
2012-12-18 21:14:22 +02:00
Antoine Pitrou f61dc4cea2 Relax test when WITH_PYMALLOC is false or undefined. 2012-12-18 19:50:58 +01:00
Antoine Pitrou 928405303d Following issue #13390, fix compilation --without-pymalloc, and make sys.getallocatedblocks() return 0 in that situation. 2012-12-17 23:05:59 +01:00
Andrew Svetlov 3438fa496d Get rig of EnvironmentError (#16705) 2012-12-17 23:35:18 +02:00
Andrew Svetlov 6eda46de99 Replace mmap.error with OSError, #16705 2012-12-17 22:55:31 +02:00
Andrew Svetlov 6d8a122b9c Issue #16704: Get rid of select.error in stdlib. Use OSError instead. 2012-12-17 22:23:46 +02:00
Giampaolo Rodola' 5ee29491e5 Issue 16646 (ftplib): deliberately use intermediate variable after catching exception 2012-12-17 20:46:45 +01:00
Giampaolo Rodola' b6375a2d91 Issue 16646 (ftplib): deliberately use intermediate variable after catching exception 2012-12-17 20:46:29 +01:00
Giampaolo Rodola' 57f3487994 Issue 16646 (ftplib): deliberately use intermediate variable after catching exception 2012-12-17 20:46:16 +01:00
Andrew Svetlov 786fbd8db7 Replace os.error with OSError in tkinter and IDLE 2012-12-17 19:51:15 +02:00
Andrew Svetlov 69d03c4799 Cleanup: remove not needed mocks. 2012-12-17 19:27:10 +02:00
Andrew Svetlov 80ab6c53c6 merge heads 2012-12-17 19:07:57 +02:00
Andrew Svetlov ed3f6c6c79 Issue #16647: save socket error details in LMTP.connect()
Patch by Serhiy Storchaka.
2012-12-17 19:06:43 +02:00
Andrew Svetlov 2ade6f24cb Issue #16647: save socket error details in LMTP.connect()
Initial patch by Serhiy Storchaka.
2012-12-17 18:57:16 +02:00
Andrew Svetlov 3b69824de9 Issue #16647: save socket error details in LMTP.connect()
Patch by Serhiy Storchaka.
2012-12-17 18:55:10 +02:00
Andrew Svetlov b6693c4604 Issue #16647: save socket error details in LMTP.connect()
Patch by Serhiy Storchaka.
2012-12-17 18:54:53 +02:00
Andrew Svetlov df485ca493 Remove obsolete code: now IOError and WindowsError are aliases for OSError 2012-12-17 16:15:35 +02:00
Giampaolo Rodola' c2a8169aa3 Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka) 2012-12-17 14:30:48 +01:00
Giampaolo Rodola' 527e725732 Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka) 2012-12-17 14:23:41 +01:00
Giampaolo Rodola' 896cb15d0c Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka) 2012-12-17 14:22:19 +01:00
Giampaolo Rodola' fc3278802c Fix issue #16646: ftplib.FTP.makeport() might lose socket error details. (patch by Serhiy Storchaka) 2012-12-17 14:20:27 +01:00
Stefan Krah 8e47b8767b Merge 3.3. 2012-12-16 21:11:35 +01:00
Stefan Krah 9a4ff437d1 Issue #15783: Support None default values in the Context() constructor. 2012-12-16 21:10:35 +01:00
Antoine Pitrou d2fc88bbde Silence sporadic failure in RecvmsgSCTPStreamTest.testRecvmsgEOF (issue #13876) - probably not Python-related. 2012-12-16 16:40:22 +01:00
Antoine Pitrou 92f8b0016e Silence sporadic failure in RecvmsgSCTPStreamTest.testRecvmsgEOF (issue #13876) - probably not Python-related. 2012-12-16 16:40:04 +01:00
Antoine Pitrou 697ce5560f Fix ResourceWarnings in test_pty 2012-12-16 16:09:11 +01:00
Antoine Pitrou feb318a37a Issue #16696: fix comparison between bytes and string. Also, improve glob tests. 2012-12-16 16:03:57 +01:00
Antoine Pitrou 33138df36a Issue #16696: fix comparison between bytes and string. Also, improve glob tests. 2012-12-16 16:03:42 +01:00
Antoine Pitrou 5461558d1a Issue #16696: fix comparison between bytes and string. Also, improve glob tests. 2012-12-16 16:03:01 +01:00
Antoine Pitrou 124ee8b1ab Issue #16626: Fix infinite recursion in glob.glob() on Windows when the pattern contains a wildcard in the drive or UNC path.
Patch by Serhiy Storchaka.
2012-12-16 13:55:47 +01:00
Antoine Pitrou 39a6ee20ac Issue #16626: Fix infinite recursion in glob.glob() on Windows when the pattern contains a wildcard in the drive or UNC path.
Patch by Serhiy Storchaka.
2012-12-16 13:54:14 +01:00
Antoine Pitrou 3c331bb729 Issue #16626: Fix infinite recursion in glob.glob() on Windows when the pattern contains a wildcard in the drive or UNC path.
Patch by Serhiy Storchaka.
2012-12-16 13:50:19 +01:00
Antoine Pitrou 3d068b2ecf Issue #16626: Fix infinite recursion in glob.glob() on Windows when the pattern contains a wildcard in the drive or UNC path.
Patch by Serhiy Storchaka.
2012-12-16 13:49:37 +01:00
Hynek Schlawack 0bb8d8c4c9 #16664: Add regression tests for glob's behaviour concerning "."-entries
Patch by Sebastian Kreft.
2012-12-16 12:46:58 +01:00
Hynek Schlawack 9ca5893338 #16664: Add regression tests for glob's behaviour concerning "."-entries
Patch by Sebastian Kreft.
2012-12-16 12:44:07 +01:00
Hynek Schlawack dec59ec5ff #16664: Add regression tests for glob's behaviour concerning "."-entries
Patch by Sebastian Kreft.
2012-12-16 12:39:11 +01:00
Hynek Schlawack 646c7b5086 #16664: Add regression tests for glob's behaviour concerning "."-entries
Patch by Sebastian Kreft.
2012-12-16 12:30:57 +01:00
Stefan Krah 8031d0dfd4 Merge 3.3. 2012-12-15 22:36:49 +01:00
Stefan Krah 040e311826 Issue #15783: Except for the number methods, the C version of decimal now
supports all None default values present in decimal.py. These values were
largely undocumented.
2012-12-15 22:33:33 +01:00
Petri Lehtinen 74d6c250e1 #11175: argparse.FileType now accepts encoding and errors arguments.
Patch by Lucas Maystre.
2012-12-15 22:42:47 +02:00
Antoine Pitrou 09bb89b8cf Issue #16488: epoll() objects now support the `with` statement.
Patch by Serhiy Storchaka.
2012-12-15 21:14:21 +01:00
Antoine Pitrou c48e81ed46 Merge 2012-12-15 19:26:38 +01:00
Antoine Pitrou 3454339430 Issue #16298: In HTTPResponse.read(), close the socket when there is no Content-Length and the incoming stream is finished.
Patch by Eran Rundstein.
2012-12-15 19:23:34 +01:00
Antoine Pitrou d20e7745ee Issue #16298: In HTTPResponse.read(), close the socket when there is no Content-Length and the incoming stream is finished.
Patch by Eran Rundstein.
2012-12-15 19:22:30 +01:00
Antoine Pitrou 084daa2f74 Issue #16298: In HTTPResponse.read(), close the socket when there is no Content-Length and the incoming stream is finished.
Patch by Eran Rundstein.
2012-12-15 19:11:54 +01:00
Antoine Pitrou 4113d2bd36 Issue #16298: In HTTPResponse.read(), close the socket when there is no Content-Length and the incoming stream is finished.
Patch by Eran Rundstein.
2012-12-15 19:11:54 +01:00
Benjamin Peterson 9272279afd use error label instead of breaking eval loop (closes #16693) 2012-12-15 12:51:05 -05:00
Andrew Svetlov ef9a43b2c9 Rename test module names for #16421 to don't clash with other tests. 2012-12-15 17:22:59 +02:00
Andrew Svetlov 22f36eed4d Cleanup filecmp: starting from 3.3 os.error is alias for OSError 2012-12-14 18:02:27 +02:00
Andrew Svetlov 6b2cbeba58 Issue #16421: allow to load multiple modules from the same shared object.
Patch by Václav Šmilauer.
2012-12-14 17:04:59 +02:00
Andrew Svetlov b67596d815 Issue #16049: add abc.ABC helper class.
Patch by Bruno Dupuis.
2012-12-13 19:09:33 +02:00
Ross Lagerwall 174bc1e309 Merge with 3.3 for #16661 2012-12-13 15:21:16 +00:00
Ross Lagerwall a0b315f5f7 Issue #16661: Fix the os.getgrouplist() test by not assuming that it
gives the same output as "id -G".
2012-12-13 15:20:26 +00:00
Hynek Schlawack 6c722c6df4 #15872: Some more Windows related tuning to shutil.rmtree tests
Turns out, the snakebite bots have also their peculiarities.

I'm really not proud of this stream of commits. :(
2012-12-10 16:35:16 +01:00
Hynek Schlawack c474c4e749 #15872: Some more Windows related tuning to shutil.rmtree tests
Turns out, the snakebite bots behave also their peculiarities.

I'm really not proud of this stream of commits. :(
2012-12-10 16:33:41 +01:00
Hynek Schlawack 87f9b46f15 #15872: Some more Windows related tuning to shutil.rmtree tests
Turns out, the snakebite bots behave also their peculiarities.

I'm really not proud of this stream of commits. :(
2012-12-10 16:29:57 +01:00
Hynek Schlawack 99d28ce0cd #15872: Be flexible with appending *.* in shutil.rmtree test case
The Windows buildbots seem to be unable to agree whether they need them or not.
2012-12-10 12:05:45 +01:00
Hynek Schlawack f29b4937f7 #15872: Be flexible with appending *.* in shutil.rmtree test case
The Windows buildbots seem to be unable to agree whether they need them or not.
2012-12-10 12:02:26 +01:00
Hynek Schlawack b9e9f3e70d #15872: Be flexible with appending *.* in shutil.rmtree test case
The Windows buildbots seem to be unable to agree whether they need them or not.
2012-12-10 12:01:28 +01:00
Hynek Schlawack 8ade268c6b #15872: More shutil test fixes for Windows
This one is different from 3.2 and 3.3.  Windows ceased using *.* since 3.4
apparently.
2012-12-10 11:12:57 +01:00
Senthil Kumaran 5962cce050 Fix Issue15701 : add .headers attribute to urllib.error.HTTPError 2012-12-10 02:09:35 -08:00
Hynek Schlawack 9d5e0cca85 #15872: More shutil test fixes for Windows 2012-12-10 11:08:59 +01:00
Hynek Schlawack 9a4a750673 #15872: More shutil test fixes for Windows 2012-12-10 11:08:09 +01:00
Hynek Schlawack 8e5a8296cc #15872: Fix shutil.rmtree error tests for Windows 2012-12-10 10:10:40 +01:00
Hynek Schlawack b57b094077 #15872: Fix shutil.rmtree error tests for Windows 2012-12-10 10:08:41 +01:00
Hynek Schlawack 9e8ac56e35 #15872: Fix shutil.rmtree error tests for Windows 2012-12-10 10:07:11 +01:00
Hynek Schlawack ae9a9e9a2d #15872: Fix 3.3 regression introduced by the new fd-based shutil.rmtree
It caused rmtree to not ignore certain errors when ignore_errors was set.

Patch by Alessandro Moura and Serhiy Storchaka.
2012-12-10 09:15:23 +01:00
Hynek Schlawack b550110f64 #15872: Fix 3.3 regression introduced by the new fd-based shutil.rmtree
It caused rmtree to not ignore certain errors when ignore_errors was set.

Patch by Alessandro Moura and Serhiy Storchaka.
2012-12-10 09:11:25 +01:00
Hynek Schlawack d16eacba48 #15872: Add tests for a 3.3 regression in the new fd-based shutil.rmtree
It cause shutil.rmtree not ignore all errors. Also add a test ensuring that
rmtree fails when being called on a symlink. Patch by Serhiy Storchaka.
2012-12-10 09:00:09 +01:00
Chris Jerdonek e53e44f3bb Issue #16629: Merge IDLE test fix from 3.3. 2012-12-09 18:22:21 -08:00
Chris Jerdonek af72f9ea9c Issue #16629: Merge IDLE test fix from 3.2. 2012-12-09 18:19:54 -08:00
Chris Jerdonek 175196886e Issue #16629: Fix IDLE idlelib.CallTips test. Patch by Roger Serwy.
This commit updates a test broken by the change made for issue #14783.
2012-12-09 18:17:27 -08:00
Andrew Svetlov 33b9b71e8d Issue #16582: use int exit code in tkinter._exit 2012-12-10 00:05:08 +02:00
Andrew Svetlov a6b292fbc7 Issue #16582: use int exit code in tkinter._exit 2012-12-10 00:03:55 +02:00
Andrew Svetlov 14857cf8fa Issue #16582: use int exit code in tkinter._exit 2012-12-10 00:03:39 +02:00
Andrew Svetlov 806bfad457 Issue #16582: use int exit code in tkinter._exit 2012-12-10 00:02:31 +02:00
Richard Oudkerk 07c34bf19f Make test of poll() use unbuffered IO 2012-12-09 16:05:22 +00:00
Richard Oudkerk 53dff0c059 Issue #16616: Enable test in test_poll which was (accidentally?) disabled 2012-12-09 16:05:20 +00:00
Antoine Pitrou db0420db17 Issue #16248: Disable code execution from the user's home directory by tkinter when the -E flag is passed to Python.
Patch by Zachary Ware.
2012-12-09 14:47:23 +01:00
Antoine Pitrou 373528f6b1 Issue #16248: Disable code execution from the user's home directory by tkinter when the -E flag is passed to Python.
Patch by Zachary Ware.
2012-12-09 14:46:46 +01:00
Antoine Pitrou 7dddec4e9d Issue #16248: Disable code execution from the user's home directory by tkinter when the -E flag is passed to Python.
Patch by Zachary Ware.
2012-12-09 14:46:18 +01:00
Antoine Pitrou 7ec3a32360 Issue #16248: Disable code execution from the user's home directory by tkinter when the -E flag is passed to Python.
Patch by Zachary Ware.
2012-12-09 14:46:18 +01:00
Antoine Pitrou f9d0b1256f Issue #13390: New function :func:`sys.getallocatedblocks()` returns the number of memory blocks currently allocated.
Also, the ``-R`` option to regrtest uses this function to guard against memory allocation leaks.
2012-12-09 14:28:26 +01:00
Éric Araujo bb7da03f6e Merge fixes for #13614, #13512 and #7719 from 3.3 2012-12-08 22:57:08 -05:00
Éric Araujo 3f7c0e4036 Merge fixes for #13614, #13512 and #7719 from 3.2 2012-12-08 22:53:43 -05:00
Éric Araujo 24457c9ad3 Branch merge 2012-12-08 22:47:03 -05:00
Éric Araujo 367efc254d Branch merge 2012-12-08 22:45:09 -05:00