X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=lib%2Fmudpy%2Fpassword.py;fp=lib%2Fmudpy%2Fpassword.py;h=f6c1abc5562cf4a13b82660346361933e816b139;hp=b6b4be5044b8a0e9c764137794c7b50567574038;hb=e0a20398d5cae3ea927132fb29a1bf76d0bb239a;hpb=2a1119763de7805f617d8b62b8f0822969f3d7df

diff --git a/lib/mudpy/password.py b/lib/mudpy/password.py
index b6b4be5..f6c1abc 100644
--- a/lib/mudpy/password.py
+++ b/lib/mudpy/password.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """Password hashing functions and constants for the mudpy engine."""
 
-# Copyright (c) 2004-2013 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2014 Jeremy Stanley <fungi@yuggoth.org>. Permission
 # to use, copy, modify, and distribute this software is granted under
 # terms provided in the LICENSE file distributed with this software.
 
@@ -163,11 +163,7 @@ def create(
     # number of times
     for i in range(2 ** rounds):
         hashed = algorithms[algorithm](hashed.encode("utf-8")).digest()
-        # TODO: remove this check after the switch to py3k
-        try:
-            hashed = "".join(format(x, "02x") for x in bytes(hashed))
-        except ValueError:
-            hashed = "".join(format(ord(x), "02x") for x in bytes(hashed))
+        hashed = "".join(format(x, "02x") for x in bytes(hashed))
 
     # concatenate the output fields, coercing into text form as needed
     return "%s%s%s%s%s%s%s%s" % (