Merge pull request #2 from nickj21/python3-compatible

Python3 compatible

Author: ahothan

.gitignore

@@ -56,6 +56,7 @@ ChangeLog
 .*sw?
 *cscope*
 .ropeproject/
+.idea/
 
 *.local*
 *.json

hdrh/codec.py

@@ -22,6 +22,10 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from __future__ import print_function
+from builtins import str
+from builtins import range
+from builtins import object
 
 import base64
 import ctypes
@@ -233,10 +237,10 @@ def compress(self, counts_limit):
 
     def dump(self, label=None):
         if label:
-            print 'Payload Dump ' + label
-        print '   payload cookie: %x' % (self.payload.cookie)
-        print '   payload_len: %d' % (self.payload.payload_len)
-        print '   counts_len: %d' % (self.counts_len)
+            print('Payload Dump ' + label)
+        print('   payload cookie: %x' % (self.payload.cookie))
+        print('   payload_len: %d' % (self.payload.payload_len))
+        print('   counts_len: %d' % (self.counts_len))
         dump_payload(self.get_counts(), self.counts_len)
 
 
@@ -297,7 +301,7 @@ def encode(self):
         if self.b64_wrap:
             self.header.length = len(cpayload)
             header_str = ctypes.string_at(addressof(self.header), ext_header_size)
-            return base64.b64encode(''.join([header_str, cpayload]))
+            return base64.b64encode(header_str + cpayload)
         return cpayload
 
     @staticmethod
@@ -355,19 +359,19 @@ def add(self, other_encoder):
 def _dump_series(start, stop, count):
     if stop <= start + 1:
         # single index range
-        print '[%06d] %d' % (start, count)
+        print('[%06d] %d' % (start, count))
     else:
-        print '[%06d] %d (%d identical)' % (start, count, stop - start)
+        print('[%06d] %d (%d identical)' % (start, count, stop - start))
 
 def dump_payload(counts, max_index):
-    print 'counts array size = %d entries' % (max_index)
+    print('counts array size = %d entries' % (max_index))
     if not max_index:
         return
     series_start_index = 0
     total_count = 0
     current_series_count = counts[0]
     index = 0
-    for index in xrange(1, max_index):
+    for index in range(1, max_index):
         total_count += counts[index]
         if counts[index] != current_series_count:
             # dump the current series
@@ -377,8 +381,8 @@ def dump_payload(counts, max_index):
             series_start_index = index
     # there is always a last series to dump
     _dump_series(series_start_index, index, counts[index])
-    print '[%06d] --END-- total count=%d' % (index + 1, total_count)
+    print('[%06d] --END-- total count=%d' % (index + 1, total_count))
 
 def hex_dump(label, str):
-    print label
-    print ':'.join(x.encode('hex') for x in str)
+    print(label)
+    print(':'.join(x.encode('hex') for x in str))

hdrh/histogram.py

@@ -19,6 +19,9 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from __future__ import division
+from builtins import range
+from builtins import object
 import math
 import sys
 from hdrh.iterators import AllValuesIterator
@@ -32,7 +35,7 @@ def get_bucket_count(value, subb_count, unit_mag):
     smallest_untrackable_value = subb_count << unit_mag
     buckets_needed = 1
     while smallest_untrackable_value <= value:
-        if smallest_untrackable_value > sys.maxint / 2:
+        if smallest_untrackable_value > sys.maxsize // 2:
             return buckets_needed + 1
         smallest_untrackable_value <<= 1
         buckets_needed += 1
@@ -96,22 +99,20 @@ def __init__(self,
         self.lowest_trackable_value = lowest_trackable_value
         self.highest_trackable_value = highest_trackable_value
         self.significant_figures = significant_figures
-        self.unit_magnitude = int(math.floor(math.log(lowest_trackable_value) /
-                                             math.log(2)))
+        self.unit_magnitude = int(math.floor(math.log(lowest_trackable_value) / math.log(2)))
         largest_value_single_unit_res = 2 * math.pow(10, significant_figures)
-        subb_count_mag = int(math.ceil(math.log(largest_value_single_unit_res) /
-                                       math.log(2)))
+        subb_count_mag = int(math.ceil(math.log(largest_value_single_unit_res) / math.log(2)))
         self.sub_bucket_half_count_magnitude = subb_count_mag - 1 if subb_count_mag > 1 else 0
         self.sub_bucket_count = int(math.pow(2, self.sub_bucket_half_count_magnitude + 1))
-        self.sub_bucket_half_count = self.sub_bucket_count / 2
+        self.sub_bucket_half_count = self.sub_bucket_count // 2
         self.sub_bucket_mask = (self.sub_bucket_count - 1) << self.unit_magnitude
         self.bucket_count = get_bucket_count(highest_trackable_value,
                                              self.sub_bucket_count,
                                              self.unit_magnitude)
-        self.min_value = sys.maxint
+        self.min_value = sys.maxsize
         self.max_value = 0
         self.total_count = 0
-        self.counts_len = (self.bucket_count + 1) * (self.sub_bucket_count / 2)
+        self.counts_len = (self.bucket_count + 1) * (self.sub_bucket_count // 2)
         self.word_size = word_size
 
         if hdr_payload:
@@ -273,7 +274,7 @@ def get_value_at_percentile(self, percentile):
         '''
         count_at_percentile = self.get_target_count_at_percentile(percentile)
         total = 0
-        for index in xrange(self.counts_len):
+        for index in range(self.counts_len):
             total += self.get_count_at_index(index)
             if total >= count_at_percentile:
                 value_at_index = self.get_value_from_index(index)
@@ -299,7 +300,7 @@ def get_percentile_to_value_dict(self, percentile_list):
         percentile_list = list(set(percentile_list))
         percentile_list.sort()
 
-        for index in xrange(self.counts_len):
+        for index in range(self.counts_len):
             total += self.get_count_at_index(index)
             while True:
                 # recalculate target based on next requested percentile
@@ -347,8 +348,8 @@ def get_max_value(self):
     def get_min_value(self):
         if 0 < self.counts[0] or self.total_count == 0:
             return 0
-        if sys.maxint == self.min_value:
-            return sys.maxint
+        if sys.maxsize == self.min_value:
+            return sys.maxsize
         return self.get_lowest_equivalent_value(self.min_value)
 
     def _hdr_size_of_equiv_value_range(self, value):
@@ -384,10 +385,10 @@ def get_stddev(self):
     def reset(self):
         '''Reset the histogram to a pristine state
         '''
-        for index in xrange(self.counts_len):
+        for index in range(self.counts_len):
             self.counts[index] = 0
         self.total_count = 0
-        self.min_value = sys.maxint
+        self.min_value = sys.maxsize
         self.max_value = 0
 
     def __iter__(self):
@@ -513,7 +514,7 @@ def add(self, other_hist):
         else:
             # Arrays are not a direct match, so we can't just stream through and add them.
             # Instead, go through the array and add each non-zero value found at it's proper value:
-            for index in xrange(other_hist.counts_len):
+            for index in range(other_hist.counts_len):
                 other_count = other_hist.get_count_at_index(index)
                 if other_count > 0:
                     self.record_value(other_hist.get_value_from_index(index), other_count)

hdrh/iterators.py

@@ -21,6 +21,8 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from __future__ import division
+from builtins import object
 from abc import abstractmethod
 import math
 
@@ -103,7 +105,7 @@ def reset_iterator(self, histogram):
     def has_next(self):
         return self.total_count_to_current_index < self.total_count
 
-    def next(self):
+    def __next__(self):
         if self.total_count != self.histogram.total_count:
             raise HdrConcurrentModificationException()
         while self.has_next():
@@ -303,8 +305,7 @@ def increment_iteration_level(self):
         self.percentile_to_iterate_from = self.percentile_to_iterate_to
         percentile_gap = 100.0 - (self.percentile_to_iterate_to)
         if percentile_gap:
-            half_distance = math.pow(2,
-                                     (math.log(100 / percentile_gap) / math.log(2)) + 1)
+            half_distance = math.pow(2, (math.log(100 / percentile_gap) / math.log(2)) + 1)
             percentile_reporting_ticks = self.percentile_ticks_per_half_distance * half_distance
             self.percentile_to_iterate_to += 100.0 / percentile_reporting_ticks
 

hdrh/log.py

@@ -29,6 +29,8 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 '''
+from __future__ import division
+from builtins import object
 import datetime
 import re
 import sys
@@ -86,8 +88,8 @@ def output_interval_histogram(self,
         self.log.write("%f,%f,%f,%s\n" %
                        (start_time_stamp_sec,
                         end_time_stamp_sec - start_time_stamp_sec,
-                        histogram.get_max_value() / max_value_unit_ratio,
-                        cpayload))
+                        histogram.get_max_value() // max_value_unit_ratio,
+                        cpayload.decode('utf-8')))
 
     def output_start_time(self, start_time_msec):
         '''Log a start time in the log.
@@ -170,7 +172,7 @@ def get_start_time_sec(self):
     def _decode_next_interval_histogram(self,
                                         dest_histogram,
                                         range_start_time_sec=0.0,
-                                        range_end_time_sec=sys.maxint,
+                                        range_end_time_sec=sys.maxsize,
                                         absolute=False):
         '''Read the next interval histogram from the log, if interval falls
         within an absolute or relative time range.
@@ -287,7 +289,7 @@ def _decode_next_interval_histogram(self,
 
     def get_next_interval_histogram(self,
                                     range_start_time_sec=0.0,
-                                    range_end_time_sec=sys.maxint,
+                                    range_end_time_sec=sys.maxsize,
                                     absolute=False):
         '''Read the next interval histogram from the log, if interval falls
         within an absolute or relative time range.
@@ -336,7 +338,7 @@ def get_next_interval_histogram(self,
     def add_next_interval_histogram(self,
                                     dest_histogram=None,
                                     range_start_time_sec=0.0,
-                                    range_end_time_sec=sys.maxint,
+                                    range_end_time_sec=sys.maxsize,
                                     absolute=False):
         '''Read the next interval histogram from the log, if interval falls
         within an absolute or relative time range, and add it to the destination

requirements.txt

@@ -1 +1,2 @@
 pbr>=1.4
+future>=0.15.2

setup.cfg

@@ -16,6 +16,7 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
 
 [files]
 packages =

setup.py

@@ -1,5 +1,4 @@
 import sys
-
 from setuptools import setup
 from setuptools import Extension
 from setuptools.command.test import test
@@ -19,11 +18,13 @@ def run_tests(self):
         import tox
         sys.exit(tox.cmdline())
 
+
 if __name__ == '__main__':
     setup(setup_requires=['pbr'], pbr=True,
+          install_requires=['future>=0.15.2'],
           keywords='hdrhistogram hdr histogram high dynamic range',
           tests_require=['tox'],
           cmdclass={'test': Tox},
-          ext_modules = [Extension('pyhdrh',
-                                   sources = ['src/python-codec.c'])]
-    )
+          ext_modules=[Extension('pyhdrh',
+                                 sources=['src/python-codec.c'])]
+          )

src/python-codec.c

@@ -269,7 +269,7 @@ static PyObject *py_hdr_decode(PyObject *self, PyObject *args) {
     int min_nonzero_index = -1;
     int max_nonzero_index = 0;
 
-    if (!PyArg_ParseTuple(args, "t#ilii", &src, &src_len,
+    if (!PyArg_ParseTuple(args, "s#ilii", &src, &src_len,
                           &read_index,
                           &vdst, &max_index,
                           &word_size)) {
@@ -460,6 +460,24 @@ static PyMethodDef HdrhMethods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-PyMODINIT_FUNC initpyhdrh(void) {
-    (void) Py_InitModule("pyhdrh", HdrhMethods);
-}
+#if PY_MAJOR_VERSION >= 3
+    static struct PyModuleDef hdrhdef = {
+        PyModuleDef_HEAD_INIT,
+        "pyhdrh",            /* m_name */
+        NULL,                /* m_doc */
+        -1,                  /* m_size */
+        HdrhMethods,         /* m_methods */
+        NULL,                /* m_reload */
+        NULL,                /* m_traverse */
+        NULL,                /* m_clear */
+        NULL,                /* m_free */
+    };
+
+    PyMODINIT_FUNC PyInit_pyhdrh(void) {
+        return PyModule_Create(&hdrhdef);
+    }
+#else
+    PyMODINIT_FUNC initpyhdrh(void) {
+        (void) Py_InitModule("pyhdrh", HdrhMethods);
+    }
+#endif