Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
69140e0c
Commit
69140e0c
authored
May 07, 2009
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Launchpad #373299: Removed bogus string exception in OFS.CopySupport.
parent
81134e55
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
11 deletions
+5
-11
doc/CHANGES.txt
doc/CHANGES.txt
+2
-0
lib/python/OFS/CopySupport.py
lib/python/OFS/CopySupport.py
+2
-1
lib/python/OFS/tests/testCopySupport.py
lib/python/OFS/tests/testCopySupport.py
+1
-10
No files found.
doc/CHANGES.txt
View file @
69140e0c
...
...
@@ -47,6 +47,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)
...
...
lib/python/OFS/CopySupport.py
View file @
69140e0c
...
...
@@ -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_(.*)'
)
...
...
lib/python/OFS/tests/testCopySupport.py
View file @
69140e0c
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment