• Tim Peters's avatar
    Merge rev 28435 from 3.3 branch. · c03a4a29
    Tim Peters authored
    Change ConflictError constructor to stop importing app objects.
    
    When the ConflictError constructor is passed a pickle, extract
    the module and class names without loading the pickle.  A ZEO
    server doesn't necessarily have the implementation code for
    application classes, and when that's so the attempt to raise
    ConflictError was itself dying with an ImportError.
    c03a4a29
testUtils.py 3.76 KB