From 72bc8627de67577833848128228de230aced670c Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 7 Jun 2007 22:20:55 -0700 Subject: [PATCH] consolidate multiple definitions of NotEnoughPeersError --- src/allmydata/download.py | 4 +--- src/allmydata/test/test_upload.py | 4 ++-- src/allmydata/upload.py | 5 +---- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/allmydata/download.py b/src/allmydata/download.py index ebbce169..859f9bfc 100644 --- a/src/allmydata/download.py +++ b/src/allmydata/download.py @@ -11,9 +11,7 @@ from allmydata import codec, hashtree from allmydata.Crypto.Cipher import AES from allmydata.uri import unpack_uri from allmydata.interfaces import IDownloadTarget, IDownloader - -class NotEnoughPeersError(Exception): - pass +from allmydata.encode import NotEnoughPeersError class HaveAllPeersError(Exception): # we use this to jump out of the loop diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py index d5b20c1c..cf6017a0 100644 --- a/src/allmydata/test/test_upload.py +++ b/src/allmydata/test/test_upload.py @@ -3,7 +3,7 @@ from twisted.trial import unittest from twisted.python.failure import Failure from cStringIO import StringIO -from allmydata import upload +from allmydata import upload, encode from allmydata.uri import unpack_uri from test_encode import FakePeer @@ -63,7 +63,7 @@ class FullServer(unittest.TestCase): self.u.parent = self.node def _should_fail(self, f): - self.failUnless(isinstance(f, Failure) and f.check(upload.NotEnoughPeersError)) + self.failUnless(isinstance(f, Failure) and f.check(encode.NotEnoughPeersError)) def testData(self): data = "This is some data to upload" diff --git a/src/allmydata/upload.py b/src/allmydata/upload.py index 48b03f54..4314c3af 100644 --- a/src/allmydata/upload.py +++ b/src/allmydata/upload.py @@ -13,9 +13,6 @@ from allmydata.Crypto.Cipher import AES from cStringIO import StringIO import collections, random -class NotEnoughPeersError(Exception): - pass - class HaveAllPeersError(Exception): # we use this to jump out of the loop pass @@ -146,7 +143,7 @@ class FileUploader: # But we allocated places for enough shares. log.msg("%s._locate_all_shareholders() But we allocated places for enough shares.") return self.used_peers - raise NotEnoughPeersError + raise encode.NotEnoughPeersError # we need to keep trying return self._locate_more_shareholders() -- 2.45.2