From 5720cdc8c9b22ddba8912ef31e84f1528a51866d Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 28 Feb 2015 08:33:22 +0000
Subject: [PATCH] Inlining

---
 letsencrypt/acme/challenges.py | 5 +++--
 letsencrypt/acme/messages.py   | 4 +---
 letsencrypt/acme/util.py       | 4 ----
 letsencrypt/acme/util_test.py  | 4 ----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/letsencrypt/acme/challenges.py b/letsencrypt/acme/challenges.py
index fb3110bb1..bea3a7ebb 100644
--- a/letsencrypt/acme/challenges.py
+++ b/letsencrypt/acme/challenges.py
@@ -1,4 +1,5 @@
 """ACME Identifier Validation Challenges."""
+import binascii
 import functools
 import hashlib
 
@@ -106,12 +107,12 @@ class DVSNI(DVChallenge):
     @property
     def nonce_domain(self):
         """Domain name used in SNI."""
-        return self._encode_hex16(self.nonce) + self.DOMAIN_SUFFIX
+        return binascii.hexlify(self.nonce) + self.DOMAIN_SUFFIX
 
     def _fields_to_json(self):
         return {
             "r": jose.b64encode(self.r),
-            "nonce": self._encode_hex16(self.nonce),
+            "nonce": binascii.hexlify(self.nonce),
         }
 
     @classmethod
diff --git a/letsencrypt/acme/messages.py b/letsencrypt/acme/messages.py
index 777a5b7d8..6f95dc344 100644
--- a/letsencrypt/acme/messages.py
+++ b/letsencrypt/acme/messages.py
@@ -42,12 +42,10 @@ class Message(util.TypedACMEObject):
             raise errors.ValidationError("missing type field")
 
         try:
-            msg_cls = cls.TYPES[msg_type]
+            return cls.TYPES[msg_type]
         except KeyError:
             raise errors.UnrecognizedTypeError(msg_type)
 
-        return msg_cls
-
     @classmethod
     def from_json(cls, jobj):
         """Deserialize from (possibly invalid) JSON object.
diff --git a/letsencrypt/acme/util.py b/letsencrypt/acme/util.py
index 819ed2e86..87ccd5365 100644
--- a/letsencrypt/acme/util.py
+++ b/letsencrypt/acme/util.py
@@ -112,10 +112,6 @@ class ACMEObject(ImmutableMap):  # pylint: disable=too-few-public-methods
 
         return decoded
 
-    @classmethod
-    def _encode_hex16(cls, data):
-        return binascii.hexlify(data)
-
     @classmethod
     def _decode_hex16(cls, data, size=None, minimum=False):
         if size is not None and ((not minimum and len(data) != size * 2)
diff --git a/letsencrypt/acme/util_test.py b/letsencrypt/acme/util_test.py
index fddb24fc3..702c08a90 100644
--- a/letsencrypt/acme/util_test.py
+++ b/letsencrypt/acme/util_test.py
@@ -160,10 +160,6 @@ class ACMEObjectTest(unittest.TestCase):
         self.assertRaises(errors.ValidationError, ACMEObject._decode_b64jose,
                           'Zm9v', size=4, minimum=True)
 
-    def test_encode_hex16(self):
-        from letsencrypt.acme.util import ACMEObject
-        self.assertEqual('666f6f', ACMEObject._encode_hex16('foo'))
-
     def test_decode_hex16(self):
         from letsencrypt.acme.util import ACMEObject
         self.assertEqual('foo', ACMEObject._decode_hex16('666f6f'))