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
c8a8c175
Commit
c8a8c175
authored
Nov 15, 2001
by
matt@zope.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lower priority of ConflictErrors so they dont cause undue alarm.
parent
5fd1da4e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/python/Zope/__init__.py
lib/python/Zope/__init__.py
+2
-2
No files found.
lib/python/Zope/__init__.py
View file @
c8a8c175
...
@@ -159,7 +159,7 @@ sys.modules['Main']=sys.modules['Zope']
...
@@ -159,7 +159,7 @@ sys.modules['Main']=sys.modules['Zope']
import
ZODB.POSException
,
ZPublisher
,
string
,
ZPublisher
import
ZODB.POSException
,
ZPublisher
,
string
,
ZPublisher
import
ExtensionClass
import
ExtensionClass
from
zLOG
import
LOG
,
INFO
,
WARNING
from
zLOG
import
LOG
,
INFO
,
WARNING
,
BLATHER
def
debug
(
*
args
,
**
kw
):
def
debug
(
*
args
,
**
kw
):
return
apply
(
ZPublisher
.
test
,(
'Zope'
,)
+
args
,
kw
)
return
apply
(
ZPublisher
.
test
,(
'Zope'
,)
+
args
,
kw
)
...
@@ -186,7 +186,7 @@ def zpublisher_exception_hook(
...
@@ -186,7 +186,7 @@ def zpublisher_exception_hook(
# do this by releasing the hold on it. There should be
# do this by releasing the hold on it. There should be
# some sane protocol for this, but for now we'll use
# some sane protocol for this, but for now we'll use
# brute force:
# brute force:
LOG
(
'Z2 CONFLICT'
,
INFO
,
LOG
(
'Z2 CONFLICT'
,
BLATHER
,
'Competing writes at, %s'
%
REQUEST
.
get
(
'PATH_INFO'
,
''
),
'Competing writes at, %s'
%
REQUEST
.
get
(
'PATH_INFO'
,
''
),
error
=
sys
.
exc_info
())
error
=
sys
.
exc_info
())
raise
ZPublisher
.
Retry
(
t
,
v
,
traceback
)
raise
ZPublisher
.
Retry
(
t
,
v
,
traceback
)
...
...
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