Commit 6b9b38ac authored by Tres Seaver's avatar Tres Seaver

Launchpad #373299: Removed bogus string exception in OFS.CopySupport.

parent b17b329a
......@@ -27,6 +27,8 @@ Zope Changes
Bugs fixed
- Launchpad #373299: Removed bogus string exception in OFS.CopySupport.
- ZPublisher response.setBody: don't append Accept-Encoding to Vary
header if it is already present - this can make cache configuration
difficult. (merged 99493)
......
......@@ -48,7 +48,8 @@ from OFS.interfaces import ICopyContainer
from OFS.interfaces import ICopySource
CopyError='Copy Error'
class CopyError(Exception):
pass
copy_re = re.compile('^copy([0-9]*)_of_(.*)')
......
......@@ -347,7 +347,7 @@ class TestCopySupportSecurity( CopySupportTestBase ):
if ce_regex is not None:
pattern = re.compile( ce_regex, re.DOTALL )
if pattern.search( e ) is None:
if pattern.search(str(e)) is None:
self.fail( "Paste failed; didn't match pattern:\n%s" % e )
else:
......@@ -418,8 +418,6 @@ class TestCopySupportSecurity( CopySupportTestBase ):
def test_copy_cant_create_target_metatype_not_supported( self ):
from OFS.CopySupport import CopyError
folder1, folder2 = self._initFolders()
folder2.all_meta_types = ()
......@@ -449,8 +447,6 @@ class TestCopySupportSecurity( CopySupportTestBase ):
def test_move_cant_read_source( self ):
from OFS.CopySupport import CopyError
folder1, folder2 = self._initFolders()
folder2.all_meta_types = FILE_META_TYPES
......@@ -469,8 +465,6 @@ class TestCopySupportSecurity( CopySupportTestBase ):
def test_move_cant_create_target_metatype_not_supported( self ):
from OFS.CopySupport import CopyError
folder1, folder2 = self._initFolders()
folder2.all_meta_types = ()
......@@ -484,8 +478,6 @@ class TestCopySupportSecurity( CopySupportTestBase ):
def test_move_cant_create_target_metatype_not_allowed( self ):
from OFS.CopySupport import CopyError
folder1, folder2 = self._initFolders()
folder2.all_meta_types = FILE_META_TYPES
......@@ -503,7 +495,6 @@ class TestCopySupportSecurity( CopySupportTestBase ):
def test_move_cant_delete_source( self ):
from OFS.CopySupport import CopyError
from AccessControl.Permissions import delete_objects as DeleteObjects
folder1, folder2 = self._initFolders()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment