summaryrefslogtreecommitdiff
path: root/paramiko/message.py
diff options
context:
space:
mode:
authorJeremy T. Bouse <jbouse@debian.org>2009-11-27 16:20:13 -0500
committerJeremy T. Bouse <jbouse@debian.org>2009-11-27 16:20:13 -0500
commitd04355ae59eba8a96d4341ec3db9d81470344703 (patch)
treeeba8c41ff15e11805b51fe959cd0906c86bb0ede /paramiko/message.py
parentb30290e934385616ea48a55ecae5912f651b0bf7 (diff)
parented280d5ac360e2af796e9bd973d7b4df89f0c449 (diff)
downloadpython-paramiko-d04355ae59eba8a96d4341ec3db9d81470344703.tar
python-paramiko-d04355ae59eba8a96d4341ec3db9d81470344703.tar.gz
Merge branch 'upstream'
Diffstat (limited to 'paramiko/message.py')
-rw-r--r--paramiko/message.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/message.py b/paramiko/message.py
index 1d75a01..1a5151c 100644
--- a/paramiko/message.py
+++ b/paramiko/message.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2003-2005 Robey Pointer <robey@lag.net>
+# Copyright (C) 2003-2007 Robey Pointer <robey@lag.net>
#
# This file is part of paramiko.
#
@@ -285,7 +285,7 @@ class Message (object):
elif type(i) is list:
return self.add_list(i)
else:
- raise exception('Unknown type')
+ raise Exception('Unknown type')
def add(self, *seq):
"""