summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuhail Patel <me@suhailpatel.com>2016-10-03 15:52:47 +0100
committerSuhail Patel <me@suhailpatel.com>2016-10-03 15:52:47 +0100
commite6f48f654ec34d9cb29402889ba16a8dee4ebbc2 (patch)
tree3c0c292040f403dff80e9f7d982c44da8fbbb091
parentb351fc9e4050821d1ecf2a9fd694b56fb64cfdcf (diff)
downloadpymemcache-e6f48f654ec34d9cb29402889ba16a8dee4ebbc2.tar.gz
We only need to import cPickle explicitly if Python 2
-rw-r--r--pymemcache/serde.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/pymemcache/serde.py b/pymemcache/serde.py
index 8c0a9da..8c88154 100644
--- a/pymemcache/serde.py
+++ b/pymemcache/serde.py
@@ -12,13 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-try:
- import cPickle as pickle
-except ImportError:
- import pickle
-
import logging
from io import BytesIO
+import six
+
+if six.PY2:
+ try:
+ import cPickle as pickle
+ except ImportError:
+ import pickle
+else:
+ import pickle
try:
long_type = long # noqa