aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Ochotnicky <sochotnicky@gmail.com>2009-08-14 13:51:12 +0200
committerStanislav Ochotnicky <sochotnicky@gmail.com>2009-08-14 14:26:01 +0200
commit28c9fbb5417ddbd9ccccea04ddfc19ad0dd8828a (patch)
tree1d436a8c8f9d01699631c90b0b5de48a60f8d3fd
parentAdded -m switch to mktinderbox chroot (diff)
downloadcollagen-28c9fbb5417ddbd9ccccea04ddfc19ad0dd8828a.tar.gz
collagen-28c9fbb5417ddbd9ccccea04ddfc19ad0dd8828a.tar.bz2
collagen-28c9fbb5417ddbd9ccccea04ddfc19ad0dd8828a.zip
Use cPickle instead of pickle if available
-rw-r--r--src/matchbox/__init__.py5
-rw-r--r--src/tinderbox/__init__.py5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/matchbox/__init__.py b/src/matchbox/__init__.py
index c6d470b..34c9daa 100644
--- a/src/matchbox/__init__.py
+++ b/src/matchbox/__init__.py
@@ -1,7 +1,10 @@
import socket
import thread
import protocol
-import pickle
+try:
+ import cPickle as pickle
+except ImportError:
+ import pickle
import StringIO
import os
import sys
diff --git a/src/tinderbox/__init__.py b/src/tinderbox/__init__.py
index 3d39493..eeb4647 100644
--- a/src/tinderbox/__init__.py
+++ b/src/tinderbox/__init__.py
@@ -1,7 +1,10 @@
import sys
import protocol
import socket
-import pickle
+try:
+ import cPickle as pickle
+except ImportError:
+ import pickle
from time import sleep
import os
import errno