From 213c48538accaadd1b22e1ba7924fe858e153617 Mon Sep 17 00:00:00 2001 From: Julien Muchembled <jm@nexedi.com> Date: Tue, 26 Jan 2010 20:39:16 +0000 Subject: [PATCH] Disable broken M2Crypto enhancement to urllib for handling 'https' url This fixes testBusinessTemplate.test_download_svn git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32000 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Type/ZopePatch.py | 1 + product/ERP5Type/patches/m2crypto.py | 44 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 product/ERP5Type/patches/m2crypto.py diff --git a/product/ERP5Type/ZopePatch.py b/product/ERP5Type/ZopePatch.py index cb5f72d53d..b847aaca85 100644 --- a/product/ERP5Type/ZopePatch.py +++ b/product/ERP5Type/ZopePatch.py @@ -21,6 +21,7 @@ ############################################################################## # Load all monkey patches +from Products.ERP5Type.patches import m2crypto from Products.ERP5Type.patches import ObjectManager from Products.ERP5Type.patches import PropertyManager from Products.ERP5Type.patches import TM diff --git a/product/ERP5Type/patches/m2crypto.py b/product/ERP5Type/patches/m2crypto.py new file mode 100644 index 0000000000..8173cde373 --- /dev/null +++ b/product/ERP5Type/patches/m2crypto.py @@ -0,0 +1,44 @@ +############################################################################## +# +# Copyright (c) 2009 Nexedi SA and Contributors. All Rights Reserved. +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsibility of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# guarantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + +# Disable broken M2Crypto enhancement to urllib for handling 'https' url +# +# M2Crypto is a dependency of portal_web_services via SOAPpy +# but it has 2 bugs breaking testBusinessTemplate.test_download_svn: +# - https://bugzilla.osafoundation.org/show_bug.cgi?id=8626 +# (see also http://www.mail-archive.com/python-list@python.org/msg127308.html +# where you can find a one-line hack to bypass the error) +# - M2Crypto doesn't automatically redirect from .../test_web to .../test_web/ + +from urllib import URLopener + +python_open_https = URLopener.open_https +try: + import M2Crypto + URLopener.open_https = python_open_https +except ImportError: + pass -- 2.30.9