Merge "except ImportError when importing cPickle on Python3"

This commit is contained in:
Jenkins 2014-06-10 19:46:42 +00:00 committed by Gerrit Code Review
commit 7bb95e581c

@ -19,7 +19,10 @@ import re
import sys
import threading
import traceback
import cPickle as pickle
try:
import cPickle as pickle
except ImportError:
import pickle
import os
from genshi.template import TemplateLoader