duplicity-team team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/duplicity/pexpect-fix into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~mterry/duplicity/pexpect-fix/+merge/207794

I forgot in my latest merge that duplicity has its own copy of pexpect.  Use that instead of requiring one from the system.
-- 
https://code.launchpad.net/~mterry/duplicity/pexpect-fix/+merge/207794
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/pexpect-fix into lp:duplicity.

=== modified file 'testing/tests/finaltest.py'
--- testing/tests/finaltest.py	2014-02-05 02:57:01 +0000
+++ testing/tests/finaltest.py	2014-02-22 16:04:26 +0000
@@ -20,7 +20,6 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 import helper
-import pexpect
 import sys, os, unittest
 
 import duplicity.backend
@@ -28,6 +27,7 @@
 from duplicity import collections
 from duplicity import commandline
 from duplicity import globals
+from duplicity import pexpect
 
 helper.setup()