[Checkins] SVN: zc.zeoinputlog/branches/replay/s enable getting blobs from s3 (using boto)

[Satchidanand Haridas]

Log message for revision 122427:
  enable getting blobs from s3 (using boto)

Changed:
  U   zc.zeoinputlog/branches/replay/setup.py
  U   zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/readonlyreplay.py

-=-
Modified: zc.zeoinputlog/branches/replay/setup.py
===================================================================
--- zc.zeoinputlog/branches/replay/setup.py	2011-07-29 17:54:14 UTC (rev 122426)
+++ zc.zeoinputlog/branches/replay/setup.py	2011-07-29 18:07:26 UTC (rev 122427)
@@ -14,6 +14,7 @@
 name, version = 'zc.zeoinputlog', '0.1.0'
 
 install_requires = [
+    'boto',
     'setuptools',
     'zc.ngi',
     'ZODB3',

Modified: zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/readonlyreplay.py
===================================================================
--- zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/readonlyreplay.py	2011-07-29 17:54:14 UTC (rev 122426)
+++ zc.zeoinputlog/branches/replay/src/zc/zeoinputlog/readonlyreplay.py	2011-07-29 18:07:26 UTC (rev 122427)
@@ -24,6 +24,7 @@
 import optparse
 import os
 import sys
+import tempfile
 import threading
 import time
 import traceback
@@ -244,7 +245,7 @@
 class S3Handler(Handler):
 
     def __init__(self, folder, addr, session, inq, outq):
-        bucket_name, self.folder = os.environ['S3_FOLDER'].split('/', 1)
+        bucket_name, self.folder = folder.split('/', 1)
         import boto.s3.connection
         import boto.s3.key
         self.s3 = boto.s3.key.Key(
@@ -254,13 +255,13 @@
     def call(self, op, args):
         if op == 'sendBlob':
             oid, serial = args
-            key.key = "%s/%s/%s" % (
+            self.s3.key = "%s/%s/%s" % (
                 self.folder, oid.encode('hex'), serial.encode('hex'))
             self.output('request', op, args)
             f = tempfile.TemporaryFile()
             t = time.time()
             try:
-                key.get_contents_to_file(f)
+                self.s3.get_contents_to_file(f)
                 ret = None
             except Exception, v:
                 ret = None, v