Merge rev 28432 from 3.3 branch.

Move more get_pickle_metadata imports.

src/scripts/netspace.py

@@ -10,8 +10,7 @@ usage: netspace.py [-P | -v] data.fs
 
 import ZODB
 from ZODB.FileStorage import FileStorage
-from ZODB.utils import U64
-from ZODB.fsdump import get_pickle_metadata
+from ZODB.utils import U64, get_pickle_metadata
 from ZODB.referencesf import referencesf
 
 def find_paths(root, maxdist):

src/scripts/space.py

@@ -10,8 +10,7 @@ Current limitations / simplifications: Ignores revisions and versions.
 """
 
 from ZODB.FileStorage import FileStorage
-from ZODB.utils import U64
-from ZODB.fsdump import get_pickle_metadata
+from ZODB.utils import U64, get_pickle_metadata
 
 def run(path, v=0):
     fs = FileStorage(path, read_only=1)