From: Brian Warner <warner@allmydata.com>
Date: Fri, 8 Jun 2007 05:13:18 +0000 (-0700)
Subject: remove several leftover defintions of netstring()
X-Git-Tag: allmydata-tahoe-0.3.0~9
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/css/rgr-080307.php?a=commitdiff_plain;h=f62a544b93b96d49afabe86a0d1b34270457eac4;p=tahoe-lafs%2Ftahoe-lafs.git

remove several leftover defintions of netstring()
---

diff --git a/src/allmydata/download.py b/src/allmydata/download.py
index 1d8729cf..ebbce169 100644
--- a/src/allmydata/download.py
+++ b/src/allmydata/download.py
@@ -569,9 +569,6 @@ class FileDownloader:
         return self._output.finish()
 
 
-def netstring(s):
-    return "%d:%s," % (len(s), s)
-
 class FileName:
     implements(IDownloadTarget)
     def __init__(self, filename):
diff --git a/src/allmydata/encode.py b/src/allmydata/encode.py
index b905c466..688c8096 100644
--- a/src/allmydata/encode.py
+++ b/src/allmydata/encode.py
@@ -10,9 +10,6 @@ from allmydata.util.assertutil import _assert
 from allmydata.codec import CRSEncoder
 from allmydata.interfaces import IEncoder
 
-def netstring(s):
-    return "%d:%s," % (len(s), s)
-
 """
 
 The goal of the encoder is to turn the original file into a series of
diff --git a/src/allmydata/test/test_encode.py b/src/allmydata/test/test_encode.py
index 07f0f058..822c4c8c 100644
--- a/src/allmydata/test/test_encode.py
+++ b/src/allmydata/test/test_encode.py
@@ -9,9 +9,6 @@ from allmydata.uri import pack_uri
 from allmydata.Crypto.Cipher import AES
 from cStringIO import StringIO
 
-def netstring(s):
-    return "%d:%s," % (len(s), s)
-
 class FakePeer:
     def __init__(self, mode="good"):
         self.ss = FakeStorageServer(mode)
diff --git a/src/allmydata/upload.py b/src/allmydata/upload.py
index b63b1a39..48b03f54 100644
--- a/src/allmydata/upload.py
+++ b/src/allmydata/upload.py
@@ -254,9 +254,6 @@ class FileUploader:
                         )
 
 
-def netstring(s):
-    return "%d:%s," % (len(s), s)
-
 class FileName:
     implements(IUploadable)
     def __init__(self, filename):