Commit f9c06ffd authored by Tim Peters's avatar Tim Peters

Merge rev 28432 from 3.3 branch.

Move more get_pickle_metadata imports.
parent 3b96dbbd
...@@ -10,8 +10,7 @@ usage: netspace.py [-P | -v] data.fs ...@@ -10,8 +10,7 @@ usage: netspace.py [-P | -v] data.fs
import ZODB import ZODB
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
from ZODB.utils import U64 from ZODB.utils import U64, get_pickle_metadata
from ZODB.fsdump import get_pickle_metadata
from ZODB.referencesf import referencesf from ZODB.referencesf import referencesf
def find_paths(root, maxdist): def find_paths(root, maxdist):
......
...@@ -10,8 +10,7 @@ Current limitations / simplifications: Ignores revisions and versions. ...@@ -10,8 +10,7 @@ Current limitations / simplifications: Ignores revisions and versions.
""" """
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
from ZODB.utils import U64 from ZODB.utils import U64, get_pickle_metadata
from ZODB.fsdump import get_pickle_metadata
def run(path, v=0): def run(path, v=0):
fs = FileStorage(path, read_only=1) fs = FileStorage(path, read_only=1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment