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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
ZODB
Commits
2d181876
Commit
2d181876
authored
Feb 28, 2013
by
Marius Gedminas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid DeprecationWarning about base64.decodestring in Py3
parent
5bc41c9b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
src/ZODB/blob.py
src/ZODB/blob.py
+2
-3
No files found.
src/ZODB/blob.py
View file @
2d181876
...
@@ -14,7 +14,6 @@
...
@@ -14,7 +14,6 @@
"""Blobs
"""Blobs
"""
"""
import
base64
import
binascii
import
binascii
import
logging
import
logging
import
os
import
os
...
@@ -32,7 +31,7 @@ import ZODB.interfaces
...
@@ -32,7 +31,7 @@ import ZODB.interfaces
from
ZODB.interfaces
import
BlobError
from
ZODB.interfaces
import
BlobError
from
ZODB
import
utils
from
ZODB
import
utils
from
ZODB.POSException
import
POSKeyError
from
ZODB.POSException
import
POSKeyError
from
ZODB._compat
import
BytesIO
,
Unpickler
from
ZODB._compat
import
BytesIO
,
Unpickler
,
decodebytes
if
sys
.
version_info
[
0
]
>=
3
:
if
sys
.
version_info
[
0
]
>=
3
:
...
@@ -824,7 +823,7 @@ class BlobStorage(BlobStorageMixin):
...
@@ -824,7 +823,7 @@ class BlobStorage(BlobStorageMixin):
# The serial_id is assumed to be given to us base-64 encoded
# The serial_id is assumed to be given to us base-64 encoded
# (belying the web UI legacy of the ZODB code :-()
# (belying the web UI legacy of the ZODB code :-()
serial_id
=
base64
.
decodestring
(
serial_id
+
b'
\
n
'
)
serial_id
=
decodebytes
(
serial_id
+
b'
\
n
'
)
self
.
_lock_acquire
()
self
.
_lock_acquire
()
...
...
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