remove several leftover defintions of netstring()

diff --git a/src/allmydata/download.py b/src/allmydata/download.py
index 1d8729cf229c554fb3ff02751566d9ee6d3f48db..ebbce16935453554a5381a655afebb25d4a9d4f9 100644 (file)
--- 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 b905c466c8c32f3dec9634a07f2886b7e78f74f7..688c809692d4ec5252b14928afabc018581099da 100644 (file)
--- 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 07f0f058093764f1483f5a8d15c85f013b0d656e..822c4c8c89f4f726b74d8eed6cc6778890a78921 100644 (file)
--- 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 b63b1a39102d132b61300d23551b0d16472eecb5..48b03f5410da0edfd5386b910b3666c517a0ea2b 100644 (file)
--- 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):