Remove Python 2 compatibility code

Author: TomFryers

docs/index.rst

@@ -56,7 +56,7 @@ Requirements
 
 The following are required to install :mod:`fitparse`,
 
-* `Python <http://www.python.org/>`_ 2.7 and above
+* `Python <http://www.python.org/>`_ 3.6 and above
 
 
 API Documentation

fitparse/base.py

@@ -5,12 +5,6 @@
 import struct
 import warnings
 
-# Python 2 compat
-try:
-    num_types = (int, float, long)
-except NameError:
-    num_types = (int, float)
-
 from fitparse.processors import FitFileDataProcessor
 from fitparse.profile import FIELD_TYPE_TIMESTAMP, MESSAGE_TYPES
 from fitparse.records import (
@@ -396,7 +390,7 @@ def _apply_scale_offset(self, field, raw_value):
         if isinstance(raw_value, tuple):
             # Contains multiple values, apply transformations to all of them
             return tuple(self._apply_scale_offset(field, x) for x in raw_value)
-        elif isinstance(raw_value, num_types):
+        elif isinstance(raw_value, (int, float)):
             if field.scale:
                 raw_value = float(raw_value) / field.scale
             if field.offset:

fitparse/records.py

@@ -1,18 +1,7 @@
 import math
 import struct
 
-# Python 2 compat
-try:
-    int_types = (int, long,)
-    byte_iter = bytearray
-except NameError:
-    int_types = (int,)
-    byte_iter = lambda x: x
-
-try:
-    from itertools import zip_longest
-except ImportError:
-    from itertools import izip_longest as zip_longest
+from itertools import zip_longest
 
 
 class RecordBase:
@@ -336,7 +325,7 @@ def render(self, raw_value):
             raw_value = unpacked_num
 
         # Mask and shift like a normal number
-        if isinstance(raw_value, int_types):
+        if isinstance(raw_value, int):
             raw_value = (raw_value >> self.bit_offset) & ((1 << self.bits) - 1)
 
         return raw_value
@@ -376,7 +365,7 @@ def format(value):
     @classmethod
     def calculate(cls, byte_arr, crc=0):
         """Compute CRC for input bytes."""
-        for byte in byte_iter(byte_arr):
+        for byte in byte_arr:
             # Taken verbatim from FIT SDK docs
             tmp = cls.CRC_TABLE[crc & 0xF]
             crc = (crc >> 4) & 0x0FFF
@@ -390,10 +379,7 @@ def calculate(cls, byte_arr, crc=0):
 
 def parse_string(string):
     try:
-        try:
-            s = string[:string.index(0x00)]
-        except TypeError: # Python 2 compat
-            s = string[:string.index('\x00')]
+        s = string[:string.index('\x00')]
     except ValueError:
         # FIT specification defines the 'string' type as follows: "Null
         # terminated string encoded in UTF-8 format".

fitparse/utils.py

@@ -1,15 +1,8 @@
 import io
 import re
-try:
-    from collections.abc import Iterable
-except ImportError:
-    from collections.abc import Iterable
+from collections.abc import Iterable
 
-try:
-    # Python 3.4+
-    from pathlib import PurePath
-except ImportError:
-    PurePath = None
+from pathlib import PurePath
 
 
 class FitParseError(ValueError):
@@ -56,18 +49,14 @@ def fileish_open(fileish, mode):
         # BytesIO-like object
         return fileish
     elif isinstance(fileish, str):
-        # Python2 - file path, file contents in the case of a TypeError
-        # Python3 - file path
-        try:
-            return open(fileish, mode)
-        except TypeError:
-            return io.BytesIO(fileish)
+        # file path
+        return open(fileish, mode)
 
-    # Python 3 - pathlib obj
-    if PurePath and isinstance(fileish, PurePath):
+    # pathlib obj
+    if isinstance(fileish, PurePath):
         return fileish.open(mode)
 
-    # Python 3 - file contents
+    # file contents
     return io.BytesIO(fileish)
 
 

scripts/fitdump

@@ -7,16 +7,8 @@ import datetime
 import itertools
 import json
 import os.path
-import sys
 import types
 
-# Python 2 compat
-try:
-    BrokenPipeError
-except NameError:
-    import socket
-    BrokenPipeError = socket.error
-
 import fitparse
 
 
@@ -44,7 +36,8 @@ def parse_args(args=None):
     )
     parser.add_argument('-v', '--verbose', action='count', default=0)
     parser.add_argument(
-        '-o', '--output', type=argparse.FileType(mode='w'), default="-",
+        '-o', '--output', type=argparse.FileType(mode='w', encoding="utf-8"),
+        default="-",
         help='File to output data into (defaults to stdout)',
     )
     parser.add_argument(
@@ -65,12 +58,6 @@ def parse_args(args=None):
 
     options = parser.parse_args(args)
 
-    # Work around argparse.FileType not accepting an `encoding` kwarg in
-    # Python < 3.4 by closing and reopening the file (unless it's stdout)
-    if options.output is not sys.stdout:
-        options.output.close()
-        options.output = codecs.open(options.output.name, 'w', encoding='UTF-8')
-
     options.verbose = options.verbose >= 1
     options.with_defs = (options.type == "readable" and options.verbose)
     options.as_dict = (options.type != "readable" and options.verbose)

setup.py

@@ -5,8 +5,8 @@
 
 
 requires = None
-if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 3):
-    sys.exit("Python 2.7 or Python 3.3+ are required.")
+if sys.version_info < (3, 6):
+    sys.exit("Python 3.6+ is required.")
 
 
 setup(

tests/test.py

@@ -4,18 +4,14 @@
 import datetime
 import os
 from struct import pack
-import sys
 import warnings
 
 from fitparse import FitFile
 from fitparse.processors import UTC_REFERENCE, StandardUnitsDataProcessor
 from fitparse.records import BASE_TYPES, Crc
 from fitparse.utils import FitEOFError, FitCRCError, FitHeaderError, FitParseError
 
-if sys.version_info >= (2, 7):
-    import unittest
-else:
-    import unittest2 as unittest
+import unittest
 
 
 def generate_messages(mesg_num, local_mesg_num, field_defs, endian='<', data=None):

tests/test_records.py

@@ -1,14 +1,8 @@
 #!/usr/bin/env python
 
-import sys
-
 from fitparse.records import Crc
 
-if sys.version_info >= (2, 7):
-    import unittest
-else:
-    import unittest2 as unittest
-
+import unittest
 
 class RecordsTestCase(unittest.TestCase):
     def test_crc(self):

tests/test_utils.py

@@ -2,21 +2,13 @@
 
 import io
 import os
-import sys
 import tempfile
 
-try:
-    # Python 3.4+
-    from pathlib import Path
-except ImportError:
-    Path = None
+from pathlib import Path
 
 from fitparse.utils import fileish_open, is_iterable
 
-if sys.version_info >= (2, 7):
-    import unittest
-else:
-    import unittest2 as unittest
+import unittest
 
 
 def testfile(filename):
@@ -44,8 +36,7 @@ def test_fopen(fileish):
             test_fopen(f.read())
         with open(testfile("nametest.FIT"), 'rb') as f:
             test_fopen(io.BytesIO(f.read()))
-        if Path:
-            test_fopen(Path(testfile('nametest.FIT')))
+        test_fopen(Path(testfile('nametest.FIT')))
 
     def test_fileish_open_write(self):