← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/testing/factory.py

[rs=buildbot-poller] automatic merge from stable. Revisions: 11265,
        11266, 11267 included.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/testing/factory.py
37
37
from types import InstanceType
38
38
import warnings
39
39
 
 
40
from bzrlib.plugins.builder.recipe import BaseRecipeBranch
40
41
import pytz
41
42
 
42
43
from twisted.python.util import mergeFunctionMetadata
2767
2768
# security wrappers for them, as well as for objects created by
2768
2769
# other Python libraries.
2769
2770
unwrapped_types = (
2770
 
    DSCFile, InstanceType, MergeDirective2, Message, datetime, int, str, unicode)
 
2771
    BaseRecipeBranch, DSCFile, InstanceType, MergeDirective2, Message,
 
2772
    datetime, int, str, unicode,)
2771
2773
 
2772
2774
 
2773
2775
def is_security_proxied_or_harmless(obj):