[minion-cvs] Move compression into Packet to avoid annoying circular...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv8847/lib/mixminion/server

Modified Files:
	Modules.py PacketHandler.py 
Log Message:
Move compression into Packet to avoid annoying circular depencence.

Index: Modules.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/Modules.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Modules.py	5 Feb 2003 05:34:55 -0000	1.27
+++ Modules.py	5 Feb 2003 06:28:31 -0000	1.28
@@ -34,8 +34,7 @@
      _parseIntervalList
 from mixminion.Common import LOG, createPrivateDir, MixError, isSMTPMailbox, \
      isPrintingAscii
-from mixminion.BuildMessage import CompressedDataTooLong
-from mixminion.Packet import ParseError
+from mixminion.Packet import ParseError, CompressedDataTooLong
 
 # Return values for processMessage
 DELIVER_OK = 1

Index: PacketHandler.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/PacketHandler.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- PacketHandler.py	5 Feb 2003 05:34:55 -0000	1.7
+++ PacketHandler.py	5 Feb 2003 06:28:31 -0000	1.8
@@ -10,7 +10,6 @@
 import mixminion.Common as Common
 import mixminion.BuildMessage
 
-from mixminion.BuildMessage import CompressedDataTooLong
 from mixminion.Common import MixError, isPrintingAscii
 
 __all__ = [ 'PacketHandler', 'ContentError', 'DeliveryPacket', 'RelayedPacket']
@@ -264,7 +263,7 @@
                 # forward message
                 self.type = 'plain'
                 # self.contents is right
-        except CompressedDataTooLong, _:
+        except Packet.CompressedDataTooLong, _:
             self.contents = (mixminion.Packet.parsePayload(message)
                                              .getContents())
             self.type = 'long'