encode.py: hush pyflakes warnings

diff --git a/src/allmydata/encode.py b/src/allmydata/encode.py
index c7dcb3aee65e315fe794a3e2658206a1e0fdbdc4..83126fe50d745a240eb241c980288de25d9daa64 100644 (file)
--- a/src/allmydata/encode.py
+++ b/src/allmydata/encode.py
@@ -3,8 +3,7 @@
 from zope.interface import implements
 from twisted.internet import defer
 from twisted.python import log
-from allmydata.hashtree import HashTree, \
-     block_hash, thingA_hash, plaintext_hash, crypttext_hash
+from allmydata.hashtree import HashTree, block_hash, thingA_hash
 from allmydata.Crypto.Cipher import AES
 from allmydata.Crypto.Hash import SHA256
 from allmydata.util import mathutil, bencode

diff --git a/src/allmydata/hashtree.py b/src/allmydata/hashtree.py
index 31c78757ae2c69b9c1c863d9c343dfbb1a017c75..a3b1c5b418e95fec3100c10f551a7d616cbbf79c 100644 (file)
--- a/src/allmydata/hashtree.py
+++ b/src/allmydata/hashtree.py
@@ -452,9 +452,3 @@ def block_hash(data):
 
 def thingA_hash(data):
     return tagged_hash("thingA", data)
-
-def plaintext_hash(data):
-    return tagged_hash("plaintext segment", data)
-
-def crypttext_hash(data):
-    return tagged_hash("crypttext segment", data)