← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/features.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/features.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
 
21
21
 
22
22
apport = tests.ModuleAvailableFeature('apport')
23
 
ApportFeature = tests._CompatabilityThunkFeature('bzrlib.tests.features',
24
 
    'ApportFeature', 'bzrlib.tests.features.apport', deprecated_in((2,1,0)))
25
23
paramiko = tests.ModuleAvailableFeature('paramiko')
26
24
pycurl = tests.ModuleAvailableFeature('pycurl')
27
25
subunit = tests.ModuleAvailableFeature('subunit')