From b01911f34d36d188c5bbe62defa9a53dbb1b092a Mon Sep 17 00:00:00 2001
From: Adam Chainz <adam@adamj.eu>
Date: Tue, 16 Aug 2016 18:14:06 +0100
Subject: Improve stats parsing

Create one function for each extra parseable type to make it clear there are different types in the stats response, and to stop wasting memory on making several `lambda`s that all do the same thing.
---
 pymemcache/client/base.py      | 38 +++++++++++++++++++++++++++-----------
 pymemcache/test/test_client.py |  4 ++++
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/pymemcache/client/base.py b/pymemcache/client/base.py
index 2d48abf..841ac46 100644
--- a/pymemcache/client/base.py
+++ b/pymemcache/client/base.py
@@ -40,25 +40,41 @@ VALID_STORE_RESULTS = {
 
 # Some of the values returned by the "stats" command
 # need mapping into native Python types
+def _parse_bool_int(value):
+    return int(value) != 0
+
+
+def _parse_bool_string_is_yes(value):
+    return value == b'yes'
+
+
+def _parse_float(value):
+    return float(value.replace(b':', b'.'))
+
+
+def _parse_hex(value):
+    return int(value, 8)
+
+
 STAT_TYPES = {
     # General stats
     b'version': six.binary_type,
-    b'rusage_user': lambda value: float(value.replace(b':', b'.')),
-    b'rusage_system': lambda value: float(value.replace(b':', b'.')),
-    b'hash_is_expanding': lambda value: int(value) != 0,
-    b'slab_reassign_running': lambda value: int(value) != 0,
+    b'rusage_user': _parse_float,
+    b'rusage_system': _parse_float,
+    b'hash_is_expanding': _parse_bool_int,
+    b'slab_reassign_running': _parse_bool_int,
 
     # Settings stats
     b'inter': six.binary_type,
     b'growth_factor': float,
     b'stat_key_prefix': six.binary_type,
-    b'umask': lambda value: int(value, 8),
-    b'detail_enabled': lambda value: int(value) != 0,
-    b'cas_enabled': lambda value: int(value) != 0,
-    b'auth_enabled_sasl': lambda value: value == b'yes',
-    b'maxconns_fast': lambda value: int(value) != 0,
-    b'slab_reassign': lambda value: int(value) != 0,
-    b'slab_automove': lambda value: int(value) != 0,
+    b'umask': _parse_hex,
+    b'detail_enabled': _parse_bool_int,
+    b'cas_enabled': _parse_bool_int,
+    b'auth_enabled_sasl': _parse_bool_string_is_yes,
+    b'maxconns_fast': _parse_bool_int,
+    b'slab_reassign': _parse_bool_int,
+    b'slab_automove': _parse_bool_int,
 }
 
 # Common helper functions.
diff --git a/pymemcache/test/test_client.py b/pymemcache/test/test_client.py
index 78d4f7a..24d6b9d 100644
--- a/pymemcache/test/test_client.py
+++ b/pymemcache/test/test_client.py
@@ -567,6 +567,8 @@ class TestClient(ClientTestMixin, unittest.TestCase):
             b'STAT rusage_system 0.852791\r\n',
             b'STAT slab_reassign_running 1\r\n',
             b'STAT version 1.4.14\r\n',
+            b'STAT umask 777\r\n',
+            b'STAT auth_enabled_sasl yes\r\n',
             b'END\r\n',
         ])
         result = client.stats()
@@ -583,6 +585,8 @@ class TestClient(ClientTestMixin, unittest.TestCase):
             b'rusage_system': 0.852791,
             b'slab_reassign_running': True,
             b'version': b'1.4.14',
+            b'umask': 0o777,
+            b'auth_enabled_sasl': True,
         }
         assert result == expected
 
-- 
cgit v1.2.1