Use compat to provide pickle or pickle5

Author: jakirkham

cloudpickle/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-import pickle
+from cloudpickle.compat import pickle
 
 
 from cloudpickle.cloudpickle import *

cloudpickle/cloudpickle.py

@@ -50,7 +50,7 @@
 import logging
 import opcode
 import operator
-import pickle
+from cloudpickle.compat import pickle
 import platform
 import struct
 import sys
@@ -62,8 +62,6 @@
 from enum import Enum
 
 from typing import Generic, Union, Tuple, Callable
-from pickle import _Pickler as Pickler
-from pickle import _getattribute
 from io import BytesIO
 from importlib._bootstrap import _find_spec
 
@@ -79,6 +77,10 @@
     ClassVar = None
 
 
+# Aliases using the compat module
+Pickler = pickle._Pickler
+_getattribute = pickle._getattribute
+
 # cloudpickle is meant for inter process communication: we expect all
 # communicating processes to run the same Python version hence we favor
 # communication speed over compatibility:

cloudpickle/cloudpickle_fast.py

@@ -15,22 +15,21 @@
 import io
 import itertools
 import logging
-import _pickle
-import pickle
+from cloudpickle.compat import pickle
+from cloudpickle.compat import _pickle
 import sys
 import types
 import weakref
 import typing
 
-from _pickle import Pickler
-
 from .cloudpickle import (
     _is_dynamic, _extract_code_globals, _BUILTIN_TYPE_NAMES, DEFAULT_PROTOCOL,
     _find_imported_submodules, _get_cell_contents, _is_importable_by_name, _builtin_type,
     Enum, _get_or_create_tracker_id,  _make_skeleton_class, _make_skeleton_enum,
     _extract_class_dict, dynamic_subimport, subimport, _typevar_reduce, _get_bases,
 )
 
+Pickler = _pickle.Pickler
 load, loads = _pickle.load, _pickle.loads