Merge pull request #506 from basho/fixes/lrb/socket-options-iteritems

Use six.iteritems for compatibility

Author: lukebakken

README.md

@@ -142,6 +142,7 @@ Contributors
 * Soren Hansen
 * Sreejith Kesavan
 * Timothée Peignier
+* [Tin Tvrtković](https://github.com/Tinche)
 * [Vitaly Shestovskiy](https://github.com/lamp0chka)
 * William Kral
 * [Yasser Souri](https://github.com/yassersouri)

riak/codecs/http.py

@@ -1,7 +1,7 @@
 import re
 import csv
+import six
 
-from six import PY2, PY3
 from cgi import parse_header
 from email import message_from_string
 from email.utils import parsedate_tz, mktime_tz
@@ -13,7 +13,7 @@
 from riak.transports.http.search import XMLSearchResult
 from riak.util import decode_index_value, bytes_to_str
 
-if PY2:
+if six.PY2:
     from urllib import unquote_plus
 else:
     from urllib.parse import unquote_plus
@@ -63,7 +63,7 @@ def _parse_body(self, robj, response, expected_statuses):
         elif status == 300:
             ctype, params = parse_header(headers['content-type'])
             if ctype == 'multipart/mixed':
-                if PY3:
+                if six.PY3:
                     data = bytes_to_str(data)
                 boundary = re.compile('\r?\n--%s(?:--)?\r?\n' %
                                       re.escape(params['boundary']))
@@ -225,7 +225,7 @@ def _normalize_json_search_response(self, json):
                     # Riak Search 1.0 Legacy assumptions about format
                     resdoc[u'id'] = doc[u'id']
                     if u'fields' in doc:
-                        for k, v in doc[u'fields'].iteritems():
+                        for k, v in six.iteritems(doc[u'fields']):
                             resdoc[k] = v
                 docs.append(resdoc)
             result['docs'] = docs

riak/transports/tcp/connection.py

@@ -2,7 +2,7 @@
 import logging
 import socket
 import struct
-
+import six
 import riak.pb.riak_pb2
 import riak.pb.messages
 
@@ -241,7 +241,7 @@ def _connect(self):
                 self._socket = socket.create_connection(self._address)
             if self._socket_tcp_options:
                 ka_opts = self._socket_tcp_options
-                for k, v in ka_opts.iteritems():
+                for k, v in six.iteritems(ka_opts):
                     self._socket.setsockopt(socket.SOL_TCP, k, v)
             if self._socket_keepalive:
                 self._socket.setsockopt(