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
8dfbff49
Commit
8dfbff49
authored
Dec 15, 2012
by
Tres Seaver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use repr(tid) to get a serial.
repr() must return text, and we need bytes.
parent
d352bdc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/ZODB/BaseStorage.py
src/ZODB/BaseStorage.py
+2
-2
src/ZODB/utils.py
src/ZODB/utils.py
+1
-1
No files found.
src/ZODB/BaseStorage.py
View file @
8dfbff49
...
...
@@ -98,7 +98,7 @@ class BaseStorage(UndoLogCompatible):
t
=
time
.
time
()
t
=
self
.
_ts
=
TimeStamp
(
*
(
time
.
gmtime
(
t
)[:
5
]
+
(
t
%
60
,)))
self
.
_tid
=
repr
(
t
)
self
.
_tid
=
t
.
raw
(
)
# ._oid is the highest oid in use (0 is always in use -- it's
# a reserved oid for the root object). Our new_oid() method
...
...
@@ -247,7 +247,7 @@ class BaseStorage(UndoLogCompatible):
now
=
time
.
time
()
t
=
TimeStamp
(
*
(
time
.
gmtime
(
now
)[:
5
]
+
(
now
%
60
,)))
self
.
_ts
=
t
=
t
.
laterThan
(
self
.
_ts
)
self
.
_tid
=
repr
(
t
)
self
.
_tid
=
t
.
raw
(
)
else
:
self
.
_ts
=
TimeStamp
(
tid
)
self
.
_tid
=
tid
...
...
src/ZODB/utils.py
View file @
8dfbff49
...
...
@@ -117,7 +117,7 @@ def newTid(old):
ts
=
TimeStamp
(
*
time
.
gmtime
(
t
)[:
5
]
+
(
t
%
60
,))
if
old
is
not
None
:
ts
=
ts
.
laterThan
(
TimeStamp
(
old
))
return
`ts`
return
ts
.
raw
()
def
oid_repr
(
oid
):
...
...
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