Clean up behaviors and their names.

Among other things, all behaviors are now named with underscores
*always*. Some esoteric behaviors have been removed or masked as well.

_pylibmcmodule.h

@@ -132,23 +132,21 @@ typedef struct {
 } PylibMC_Behavior;
 
 static PylibMC_Behavior PylibMC_behaviors[] = {
-    { MEMCACHED_BEHAVIOR_NO_BLOCK, "no block" },
+    { MEMCACHED_BEHAVIOR_NO_BLOCK, "no_block" },
     { MEMCACHED_BEHAVIOR_TCP_NODELAY, "tcp_nodelay" },
     { MEMCACHED_BEHAVIOR_HASH, "hash" },
-    { MEMCACHED_BEHAVIOR_KETAMA_HASH, "ketama hash" },
+    { MEMCACHED_BEHAVIOR_KETAMA_HASH, "ketama_hash" },
     { MEMCACHED_BEHAVIOR_KETAMA, "ketama" },
-    { MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, "ketama weighted" },
+    { MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, "ketama_weighted" },
     { MEMCACHED_BEHAVIOR_DISTRIBUTION, "distribution" },
-    { MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, "socket send size" },
+    { MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, "cache_lookups" },
-    { MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, "socket recv size" },
-    { MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, "cache lookups" },
     { MEMCACHED_BEHAVIOR_SUPPORT_CAS, "cas" },
-    { MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, "buffer requests" },
+    { MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, "buffer_requests" },
-    { MEMCACHED_BEHAVIOR_VERIFY_KEY, "verify keys" },
+    { MEMCACHED_BEHAVIOR_VERIFY_KEY, "verify_keys" },
-    { MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, "connect timeout" },
+    { MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, "connect_timeout" },
-    { MEMCACHED_BEHAVIOR_SND_TIMEOUT, "send timeout" },
+    { MEMCACHED_BEHAVIOR_SND_TIMEOUT, "send_timeout" },
-    { MEMCACHED_BEHAVIOR_RCV_TIMEOUT, "receive timeout" },
+    { MEMCACHED_BEHAVIOR_RCV_TIMEOUT, "receive_timeout" },
-    { MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, "failure limit" },
+    { MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, "failure_limit" },
     { MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK, "_io_msg_watermark" },
     { MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK, "_io_bytes_watermark" },
     { MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH, "_io_key_prefetch" },
@@ -159,6 +157,8 @@ static PylibMC_Behavior PylibMC_behaviors[] = {
     { MEMCACHED_BEHAVIOR_SORT_HOSTS, "_sort_hosts" },
     { MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, "_retry_timeout" },
     { MEMCACHED_BEHAVIOR_POLL_TIMEOUT, "_poll_timeout" },
+    { MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, "_socket_send_size" },
+    { MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, "_socket_recv_size" },
     { 0, NULL }
 };
 
@@ -170,8 +170,10 @@ static PylibMC_Behavior PylibMC_hashers[] = {
     { MEMCACHED_HASH_FNV1A_64, "fnv1a_64" },
     { MEMCACHED_HASH_FNV1_32, "fnv1_32" },
     { MEMCACHED_HASH_FNV1A_32, "fnv1a_32" },
-    { MEMCACHED_HASH_HSIEH, "hsieh" },
     { MEMCACHED_HASH_MURMUR, "murmur" },
+#ifdef MEMCACHED_HASH_HSIEH
+    { MEMCACHED_HASH_HSIEH, "hsieh" },
+#endif
     { 0, NULL }
 };
 

pylibmc.py

@@ -8,11 +8,9 @@ minor differences. If you should happen to spot any, file a bug!
 >>> b = mc.behaviors
 >>> ks = list(sorted(k for k in b.keys() if not k.startswith("_")))
 >>> ks  # doctest: +NORMALIZE_WHITESPACE
-['buffer_requests', 'cache_lookups', 'connect_timeout', 'distribution', 'hash',
+['buffer_requests', 'cache_lookups', 'cas', 'connect_timeout', 'distribution',
- 'ketama', 'ketama_hash', 'ketama_weighted', 'no block', 'poll_timeout',
+ 'failure_limit', 'hash', 'ketama', 'ketama_hash', 'ketama_weighted',
- 'rcv_timeout', 'retry_timeout', 'server_failure_limit', 'snd_timeout',
+ 'no_block', 'receive_timeout', 'send_timeout', 'tcp_nodelay', 'verify_keys']
- 'socket recv size', 'socket send size', 'sort_hosts', 'support_cas',
- 'tcp_nodelay', 'verify_key']
 >>> b["hash"]
 'default'
 >>> b["hash"] = 'fnv1a_32'
@@ -23,6 +21,7 @@ minor differences. If you should happen to spot any, file a bug!
 """
 
 import _pylibmc
+from warnings import warn
 
 __all__ = ["hashers", "distributions", "Client"]
 __version__ = _pylibmc.__version__
@@ -116,15 +115,23 @@ class Client(_pylibmc.client):
         This also happens for `distribution`.
         """
         behaviors = behaviors.copy()
+        if any(" " in k for k in behaviors):
+            warn(DeprecationWarning("space-delimited behavior names "
+                                    "are deprecated"))
+            for k in [k for k in behaviors if " " in k]:
+                behaviors[k.replace(" ", "_")] = behaviors.pop(k)
         if behaviors.get("hash") is not None:
             behaviors["hash"] = hashers[behaviors["hash"]]
-        if behaviors.get("ketama hash") is not None:
+        if behaviors.get("ketama_hash") is not None:
-            behaviors["ketama hash"] = hashers[behaviors["ketama hash"]]
+            behaviors["ketama_hash"] = hashers[behaviors["ketama_hash"]]
         if behaviors.get("distribution") is not None:
             behaviors["distribution"] = distributions[behaviors["distribution"]]
         return super(Client, self).set_behaviors(behaviors)
 
     behaviors = property(get_behaviors, set_behaviors)
+    @property
+    def behaviours(self):
+        raise AttributeError("nobody uses british spellings")
 
 from contextlib import contextmanager