Add Python 2.7 compatibility

Because apparently we're *still* not ready to move on...

Author: pR0Ps

fitparse/processors.py

@@ -1,4 +1,3 @@
-import contextlib
 import datetime
 from fitparse.utils import scrub_method_name
 
@@ -34,8 +33,10 @@ def run_message_processor(self, data_message):
         self._run_processor(scrub_method_name('process_message_%s' % data_message.def_mesg.name), data_message)
 
     def _run_processor(self, processor_name, data):
-        with contextlib.suppress(AttributeError):
+        try:
             getattr(self, processor_name)(data)
+        except AttributeError:
+            pass
 
     def process_type_bool(self, field_data):
         if field_data.value is not None:
@@ -72,7 +73,7 @@ def run_field_processor(self, field_data):
         if field_data.name.endswith("_speed"):
             self.process_field_speed(field_data)
         else:
-            super().run_field_processor(field_data)
+            super(StandardUnitsDataProcessor, self).run_field_processor(field_data)
 
     def process_field_distance(self, field_data):
         if field_data.value is not None:

fitparse/records.py

@@ -1,6 +1,11 @@
 import math
 import struct
-import itertools
+
+# Python 2 compat
+try:
+    from itertools import zip_longest
+except ImportError:
+    from itertools import izip_longest as zip_longest
 
 from fitparse.utils import FitParseError
 
@@ -16,7 +21,7 @@ class RecordBase(object):
     #       and see if that gives us any performance improvements
 
     def __init__(self, *args, **kwargs):
-        for slot_name, value in itertools.zip_longest(self.__slots__, args, fillvalue=None):
+        for slot_name, value in zip_longest(self.__slots__, args, fillvalue=None):
             setattr(self, slot_name, value)
         for slot_name, value in kwargs.items():
             setattr(self, slot_name, value)
@@ -321,6 +326,14 @@ def render(self, raw_value):
         return raw_value
 
 
+def parse_string(string):
+    try:
+        end = string.index(0x00)
+    except TypeError: # Python 2 compat
+        end = string.index('\x00')
+
+    return string[:end].decode('utf-8', errors='replace') or None
+
 # The default base type
 BASE_TYPE_BYTE = BaseType(name='byte', identifier=0x0D, fmt='B', parse=lambda x: None if all(b == 0xFF for b in x) else x)
 
@@ -332,7 +345,7 @@ def render(self, raw_value):
     0x84: BaseType(name='uint16', identifier=0x84, fmt='H', parse=lambda x: None if x == 0xFFFF else x),
     0x85: BaseType(name='sint32', identifier=0x85, fmt='i', parse=lambda x: None if x == 0x7FFFFFFF else x),
     0x86: BaseType(name='uint32', identifier=0x86, fmt='I', parse=lambda x: None if x == 0xFFFFFFFF else x),
-    0x07: BaseType(name='string', identifier=0x07, fmt='s', parse=lambda x: x[0:x.index(0)].decode('utf-8', errors='replace') or None),
+    0x07: BaseType(name='string', identifier=0x07, fmt='s', parse=parse_string),
     0x88: BaseType(name='float32', identifier=0x88, fmt='f', parse=lambda x: None if math.isnan(x) else x),
     0x89: BaseType(name='float64', identifier=0x89, fmt='d', parse=lambda x: None if math.isnan(x) else x),
     0x0A: BaseType(name='uint8z', identifier=0x0A, fmt='B', parse=lambda x: None if x == 0x0 else x),

fitparse/utils.py

@@ -20,17 +20,16 @@ class FitHeaderError(FitParseError):
 )
 
 
-def calc_crc(bytes, crc=0):
-    for byte in bytes:
-        byte_char = byte
+def calc_crc(byte_arr, crc=0):
+    for byte in bytearray(byte_arr):
         # Taken verbatim from FIT SDK docs
         tmp = CRC_TABLE[crc & 0xF]
         crc = (crc >> 4) & 0x0FFF
-        crc = crc ^ tmp ^ CRC_TABLE[byte_char & 0xF]
+        crc = crc ^ tmp ^ CRC_TABLE[byte & 0xF]
 
         tmp = CRC_TABLE[crc & 0xF]
         crc = (crc >> 4) & 0x0FFF
-        crc = crc ^ tmp ^ CRC_TABLE[(byte_char >> 4) & 0xF]
+        crc = crc ^ tmp ^ CRC_TABLE[(byte >> 4) & 0xF]
     return crc
 
 

scripts/fitdump

@@ -3,6 +3,13 @@
 import argparse
 import sys
 
+# Python 2 compat
+try:
+    BrokenPipeError
+except NameError:
+    import socket
+    BrokenPipeError = socket.error
+
 import fitparse
 
 

tests/test.py

@@ -1,11 +1,13 @@
+#!/usr/bin/env python
+
 import csv
 import datetime
 import os
 from struct import pack
 import sys
 
 from fitparse import FitFile
-from fitparse.processors import UTC_REFERENCE
+from fitparse.processors import UTC_REFERENCE, StandardUnitsDataProcessor
 from fitparse.records import BASE_TYPES
 from fitparse.utils import calc_crc, FitEOFError, FitCRCError, FitHeaderError
 
@@ -109,13 +111,13 @@ def test_component_field_accumulaters(self):
         # TODO: abstract CSV parsing
         csv_fp = open(testfile('compressed-speed-distance-records.csv'), 'r')
         csv_file = csv.reader(csv_fp)
-        csv_file.__next__()  # Consume header
+        next(csv_file)  # Consume header
 
         f = FitFile(testfile('compressed-speed-distance.fit'))
         f.parse()
 
         records = f.get_messages(name='record')
-        empty_record = records.__next__()  # Skip empty record for now (sets timestamp via header)
+        empty_record = next(records)  # Skip empty record for now (sets timestamp via header)
 
         # File's timestamp record is < 0x10000000, so field returns seconds
         self.assertEqual(empty_record.get_value('timestamp'), 17217864)
@@ -230,7 +232,7 @@ def test_subfield_components(self):
     def test_parsing_edge_500_fit_file(self):
         csv_fp = open(testfile('garmin-edge-500-activitiy-records.csv'), 'r')
         csv_messages = csv.reader(csv_fp)
-        field_names = csv_messages.__next__()  # Consume header
+        field_names = next(csv_messages)  # Consume header
 
         f = FitFile(testfile('garmin-edge-500-activitiy.fit'))
         messages = f.get_messages(name='record')
@@ -274,13 +276,13 @@ def test_parsing_edge_500_fit_file(self):
                     self.assertEqual(fit_value, csv_value)
 
         try:
-            messages.__next__()
+            next(messages)
             self.fail(".FIT file had more than csv file")
         except StopIteration:
             pass
 
         try:
-            csv_messages.__next__()
+            next(csv_messages)
             self.fail(".CSV file had more messages than .FIT file")
         except StopIteration:
             pass
@@ -346,6 +348,18 @@ def test_valid_files(self):
                   'sample-activity.fit'):
             FitFile(testfile(x)).parse()
 
+    def test_units_processor(self):
+        for x in ('2013-02-06-12-11-14.fit', '2015-10-13-08-43-15.fit',
+                  'Activity.fit', 'Edge810-Vector-2013-08-16-15-35-10.fit',
+                  'MonitoringFile.fit', 'Settings.fit', 'Settings2.fit',
+                  'WeightScaleMultiUser.fit', 'WeightScaleSingleUser.fit',
+                  'WorkoutCustomTargetValues.fit', 'WorkoutIndividualSteps.fit',
+                  'WorkoutRepeatGreaterThanStep.fit', 'WorkoutRepeatSteps.fit',
+                  'activity-large-fenxi2-multisport.fit', 'activity-small-fenix2-run.fit',
+                  'antfs-dump.63.fit', 'sample-activity-indoor-trainer.fit',
+                  'sample-activity.fit'):
+            FitFile(testfile(x), data_processor=StandardUnitsDataProcessor()).parse()
+
     # TODO:
     #  * Test Processors:
     #    - process_type_<>, process_field_<>, process_units_<>, process_message_<>