Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
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
Nicolas Wavrant
ZODB
Commits
c1245d49
Commit
c1245d49
authored
Nov 13, 2008
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some long lines. :(
parent
bc12cb73
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
src/ZEO/ClientStorage.py
src/ZEO/ClientStorage.py
+2
-1
src/ZEO/StorageServer.py
src/ZEO/StorageServer.py
+4
-2
No files found.
src/ZEO/ClientStorage.py
View file @
c1245d49
...
@@ -1417,7 +1417,8 @@ class TransactionIterator(object):
...
@@ -1417,7 +1417,8 @@ class TransactionIterator(object):
self
.
_storage
.
_forget_iterator
(
self
.
_iid
)
self
.
_storage
.
_forget_iterator
(
self
.
_iid
)
raise
ZODB
.
interfaces
.
StorageStopIteration
()
raise
ZODB
.
interfaces
.
StorageStopIteration
()
return
ClientStorageTransactionInformation
(
self
.
_storage
,
self
,
*
tx_data
)
return
ClientStorageTransactionInformation
(
self
.
_storage
,
self
,
*
tx_data
)
class
ClientStorageTransactionInformation
(
ZODB
.
BaseStorage
.
TransactionRecord
):
class
ClientStorageTransactionInformation
(
ZODB
.
BaseStorage
.
TransactionRecord
):
...
...
src/ZEO/StorageServer.py
View file @
c1245d49
...
@@ -590,7 +590,8 @@ class ZEOStorage:
...
@@ -590,7 +590,8 @@ class ZEOStorage:
def
_restore
(
self
,
oid
,
serial
,
data
,
prev_txn
):
def
_restore
(
self
,
oid
,
serial
,
data
,
prev_txn
):
err
=
None
err
=
None
try
:
try
:
self
.
storage
.
restore
(
oid
,
serial
,
data
,
''
,
prev_txn
,
self
.
transaction
)
self
.
storage
.
restore
(
oid
,
serial
,
data
,
''
,
prev_txn
,
self
.
transaction
)
except
(
SystemExit
,
KeyboardInterrupt
):
except
(
SystemExit
,
KeyboardInterrupt
):
raise
raise
except
Exception
,
err
:
except
Exception
,
err
:
...
@@ -768,7 +769,8 @@ class ZEOStorage:
...
@@ -768,7 +769,8 @@ class ZEOStorage:
txn_info
=
self
.
_txn_iterators_last
[
txn_iid
]
txn_info
=
self
.
_txn_iterators_last
[
txn_iid
]
if
txn_info
.
tid
!=
tid
:
if
txn_info
.
tid
!=
tid
:
raise
Exception
(
raise
Exception
(
'Out-of-order request for record iterator for transaction %r'
%
tid
)
'Out-of-order request for record iterator for transaction %r'
%
tid
)
self
.
_iterators
[
record_iid
]
=
iter
(
txn_info
)
self
.
_iterators
[
record_iid
]
=
iter
(
txn_info
)
return
record_iid
return
record_iid
...
...
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