Trim now redundant code in ufoLib.utils

Lib/fontTools/ufoLib/__init__.py

@@ -1,6 +1,7 @@
 import sys
 import os
 from copy import deepcopy
+from os import fsdecode
 import logging
 import zipfile
 import enum
@@ -20,7 +21,7 @@ from fontTools.ufoLib.validators import *
 from fontTools.ufoLib.filenames import userNameToFileName
 from fontTools.ufoLib.converters import convertUFO1OrUFO2KerningToUFO3Kerning
 from fontTools.ufoLib.errors import UFOLibError
-from fontTools.ufoLib.utils import datetimeAsTimestamp, fsdecode, numberTypes
+from fontTools.ufoLib.utils import numberTypes
 
 """
 A library for importing .ufo files and their descendants.
@@ -120,7 +121,7 @@ class _UFOBaseIO:
 		except (fs.errors.MissingInfoNamespace, fs.errors.ResourceNotFound):
 			return None
 		else:
-			return datetimeAsTimestamp(dt)
+			return dt.timestamp()
 
 	def _getPlist(self, fileName, default=None):
 		"""

Lib/fontTools/ufoLib/utils.py

@@ -1,50 +1,12 @@
 """The module contains miscellaneous helpers.
 It's not considered part of the public ufoLib API.
 """
-import sys
 import warnings
 import functools
-from datetime import datetime
-from fontTools.misc.py23 import tounicode
 
 
-if hasattr(datetime, "timestamp"):  # python >= 3.3
-
-    def datetimeAsTimestamp(dt):
-        return dt.timestamp()
-
-else:
-    from datetime import tzinfo, timedelta
-
-    ZERO = timedelta(0)
-
-    class UTC(tzinfo):
-
-        def utcoffset(self, dt):
-            return ZERO
-
-        def tzname(self, dt):
-            return "UTC"
-
-        def dst(self, dt):
-            return ZERO
-
-    utc = UTC()
-
-    EPOCH = datetime.fromtimestamp(0, tz=utc)
-
-    def datetimeAsTimestamp(dt):
-        return (dt - EPOCH).total_seconds()
-
-
-# TODO: should import from fontTools.misc.py23
-try:
-	long = long
-except NameError:
-	long = int
-
-integerTypes = (int, long)
-numberTypes = (int, float, long)
+integerTypes = int
+numberTypes = (int, float)
 
 
 def deprecated(msg=""):
@@ -75,10 +37,6 @@ def deprecated(msg=""):
     return deprecated_decorator
 
 
-def fsdecode(path, encoding=sys.getfilesystemencoding()):
-    return tounicode(path, encoding=encoding)
-
-
 if __name__ == "__main__":
     import doctest