From c0f420bf7d7659ee110432f7cbb0233554dfd32a Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Thu, 12 Apr 2012 21:52:26 -0400 Subject: assorted bugfixes, tweaks, and tests added; based on coverage examination * test os_crypt backend has functional fallback * test handler methods accept all unicode/bytes combinations for secret & hash * fixed some incorrect error messages & types being caught & raised * other minor cleanups --- passlib/handlers/cisco.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'passlib/handlers/cisco.py') diff --git a/passlib/handlers/cisco.py b/passlib/handlers/cisco.py index 184134e..c61a105 100644 --- a/passlib/handlers/cisco.py +++ b/passlib/handlers/cisco.py @@ -149,7 +149,7 @@ class cisco_type7(uh.GenericHandler): else: raise TypeError("no salt specified") if not isinstance(salt, int): - raise TypeError("salt must be an integer") + raise uh.exc.ExpectedTypeError(salt, "integer", "salt") if salt < 0 or salt > self.max_salt_value: msg = "salt/offset must be in 0..52 range" if self.relaxed: -- cgit v1.2.1