Merge pull request #782 from tahoe-lafs/3383.storage-tests-run-py-3

Make storage tests run (not pass, run) on Python 3

src/allmydata/interfaces.py

@@ -1,4 +1,6 @@
 
+from past.builtins import long
+
 from zope.interface import Interface, Attribute
 from twisted.plugin import (
     IPlugin,

src/allmydata/storage/crawler.py

@@ -1,6 +1,9 @@
 
 import os, time, struct
-import cPickle as pickle
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
 from twisted.internet import reactor
 from twisted.application import service
 from allmydata.storage.common import si_b2a