From: Joshua Oreman <oremanj@rwcr.net>
Date: Tue, 15 Mar 2011 03:59:52 +0000 (-0400)
Subject: UnpicklingError, not UnpickleError
X-Git-Tag: 0.0.12^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-vnc-server.git/commitdiff_plain/fac04d72c91d25313badd8da044c784670eed1ad?hp=f2c5a3fea1e12d20bc2ebe2393a3a3bf84ba06bf

UnpicklingError, not UnpickleError
---

diff --git a/debian/changelog b/debian/changelog
index 435adf2..f9fca60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-vnc-server (0.0.12) unstable; urgency=low
+
+  * UnpicklingError, not UnpickleError.
+
+ -- Joshua Oreman <oremanj@mit.edu>  Tue, 15 Mar 2011 00:00:12 -0400
+
 invirt-vnc-server (0.0.11) unstable; urgency=low
 
   * Verify HMAC of invirt-vnc token before unpickling anything.
diff --git a/python/vnc/extauth.py b/python/vnc/extauth.py
index 12176ca..c986771 100644
--- a/python/vnc/extauth.py
+++ b/python/vnc/extauth.py
@@ -78,7 +78,7 @@ class VNCAuth(protocol.Protocol):
                     self.auth_data = data
                 else:
                     self.auth_error = "Token has expired; please try logging in again"
-        except (TypeError, ValueError, cPickle.UnpickleError):
+        except (TypeError, ValueError, cPickle.UnpicklingError):
             self.auth = None            
             print sys.exc_info()