~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_import_tariff.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-05 16:03:11 UTC
  • mfrom: (6432 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6433.
  • Revision ID: jelmer@samba.org-20120105160311-12o5p67kin1v3zps
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
190
190
            'bzrlib.xml8',
191
191
            'getpass',
192
192
            'kerberos',
 
193
            'ssl',
 
194
            'socket',
193
195
            'smtplib',
194
196
            'tarfile',
195
197
            'tempfile',
 
198
            'termios',
 
199
            'tty',
 
200
            'urllib',
196
201
            ] + old_format_modules)
197
202
        # TODO: similar test for repository-only operations, checking we avoid
198
203
        # loading wt-specific stuff
262
267
            'smtplib',
263
268
            'tarfile',
264
269
            'tempfile',
 
270
            'termios',
 
271
            'tty',
265
272
            ] + old_format_modules)