From: Brian Warner <warner@lothar.com>
Date: Wed, 19 Sep 2007 06:38:11 +0000 (-0700)
Subject: upload.py: fix signature of NonConvergentUploadMixin.get_encryption_key
X-Git-Tag: allmydata-tahoe-0.6.0~68
X-Git-Url: https://git.rkrishnan.org/module-simplejson-index.html?a=commitdiff_plain;h=9c9a793540299f5b47941b127bc51263f912e030;p=tahoe-lafs%2Ftahoe-lafs.git

upload.py: fix signature of NonConvergentUploadMixin.get_encryption_key
---

diff --git a/src/allmydata/upload.py b/src/allmydata/upload.py
index db95901f..6dba4179 100644
--- a/src/allmydata/upload.py
+++ b/src/allmydata/upload.py
@@ -563,7 +563,7 @@ class NonConvergentUploadMixin:
     def set_serialized_encoding_parameters(self, params):
         pass
 
-    def get_encryption_key(self, encoding_parameters):
+    def get_encryption_key(self):
         if self._key is None:
             self._key = os.urandom(16)
         return defer.succeed(self._key)