[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[minion-cvs] appease pychecker
Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv21446/lib/mixminion
Modified Files:
ClientMain.py ClientUtils.py Common.py Config.py NetUtils.py
ServerInfo.py TLSConnection.py __init__.py
Log Message:
appease pychecker
Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -d -r1.164 -r1.165
--- ClientMain.py 6 Mar 2004 00:04:37 -0000 1.164
+++ ClientMain.py 7 Mar 2004 06:31:46 -0000 1.165
@@ -24,8 +24,9 @@
from mixminion.Common import LOG, Lockfile, LockfileLocked, MixError, \
MixFatalError, MixProtocolBadAuth, MixProtocolError, UIError, \
- UsageError, createPrivateDir, englishSequence, isPrintingAscii, isSMTPMailbox, readFile, \
- stringContains, succeedingMidnight, writeFile, previousMidnight, floorDiv
+ UsageError, createPrivateDir, englishSequence, floorDiv, isPrintingAscii,\
+ isSMTPMailbox, readFile, stringContains, succeedingMidnight, writeFile, \
+ previousMidnight
from mixminion.Packet import encodeMailHeaders, ParseError, parseMBOXInfo, \
parseReplyBlocks, parseSMTPInfo, parseTextEncodedMessages, \
parseTextReplyBlocks, ReplyBlock, parseMessageAndHeaders
Index: ClientUtils.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientUtils.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ClientUtils.py 6 Mar 2004 00:04:37 -0000 1.24
+++ ClientUtils.py 7 Mar 2004 06:31:46 -0000 1.25
@@ -905,7 +905,7 @@
if isinstance(fragment, types.StringType):
try:
fragment = mixminion.Packet.parsePayload(fragment)
- except ParseError, s:
+ except mixminion.Packet.ParseError, s:
raise UIError("Corrupted fragment payload: %s"%s)
if fragment.isSingleton():
raise UIError("Non-fragment payload marked as a fragment.")
Index: Common.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Common.py,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- Common.py 6 Mar 2004 00:33:09 -0000 1.133
+++ Common.py 7 Mar 2004 06:31:46 -0000 1.134
@@ -24,7 +24,6 @@
import cPickle
import errno
import gzip
-import math
import os
import re
import signal
Index: Config.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Config.py,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- Config.py 6 Mar 2004 00:04:37 -0000 1.79
+++ Config.py 7 Mar 2004 06:31:46 -0000 1.80
@@ -1010,8 +1010,6 @@
def validate(self, lines, contents):
_validateHostSection(self['Host'])
- security = self['Security']
-
t = self['Network'].get('ConnectionTimeout')
if t:
if int(t) < 5:
Index: NetUtils.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/NetUtils.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- NetUtils.py 6 Mar 2004 00:04:38 -0000 1.12
+++ NetUtils.py 7 Mar 2004 06:31:46 -0000 1.13
@@ -86,7 +86,6 @@
found.
"""
_,haveIP6 = getProtocolSupport()
- if not haveIP6: haveIP4 = 1
try:
r = getIPs(name)
inet4 = [ addr for addr in r if addr[0] == AF_INET ]
Index: ServerInfo.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ServerInfo.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- ServerInfo.py 6 Mar 2004 00:04:38 -0000 1.82
+++ ServerInfo.py 7 Mar 2004 06:31:46 -0000 1.83
@@ -12,7 +12,6 @@
import re
import time
-import types
import mixminion.Config
import mixminion.MMTPClient
Index: TLSConnection.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/TLSConnection.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TLSConnection.py 6 Mar 2004 00:04:38 -0000 1.14
+++ TLSConnection.py 7 Mar 2004 06:31:46 -0000 1.15
@@ -316,6 +316,8 @@
self.wantRead = 1
return 1
+ raise AssertionError() # unreached; appease pychecker
+
def __closedFn(self,r,w, cap):
"""state function: called when the connection is closed"""
self.__sock = None
Index: __init__.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/__init__.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- __init__.py 15 Dec 2003 05:16:47 -0000 1.53
+++ __init__.py 7 Mar 2004 06:31:46 -0000 1.54
@@ -7,7 +7,7 @@
"""
# This version string is generated from setup.py; don't edit it.
-__version__ = "0.0.7alpha0"
+__version__ = "0.0.7alpha2"
# This 5-tuple encodes the version number for comparison. Don't edit it.
# The first 3 numbers are the version number; the 4th is:
# 0 for alpha
@@ -18,7 +18,7 @@
# The 4th or 5th number may be a string. If so, it is not meant to
# succeed or precede any other sub-version with the same a.b.c version
# number.
-version_info = (0, 0, 7, 0, 0)
+version_info = (0, 0, 7, 0, 2)
__all__ = [ 'server', 'directory' ]
def version_tuple_to_string(t):