commit 393dc0545f3ef22ec71f4012ead384f80a719072 Author: Isis Lovecruft isis@torproject.org Date: Fri Dec 20 07:36:06 2013 +0000

Change str → basestring in lib/bridgedb/test/test_persistent.py unittest. --- lib/bridgedb/test/test_persistent.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/bridgedb/test/test_persistent.py b/lib/bridgedb/test/test_persistent.py index c3c89ef..95abf61 100644 --- a/lib/bridgedb/test/test_persistent.py +++ b/lib/bridgedb/test/test_persistent.py @@ -142,8 +142,8 @@ class StateTest(unittest.TestCase): setattr(thatConfig, 'BAR', 'all of the things') setattr(thatConfig, 'LOGFILE', 42)

- this(thatConfig).should.have.property('FOO').being.a(str) - this(thatConfig).should.have.property('BAR').being.a(str) + this(thatConfig).should.have.property('FOO').being.a(basestring) + this(thatConfig).should.have.property('BAR').being.a(basestring) this(thatConfig).should.have.property('LOGFILE').being.an(int) this(thatConfig).should.have.property('BRIDGE_FILES').being.a(list)

@@ -156,8 +156,8 @@ class StateTest(unittest.TestCase): thatState.useChangedSettings(thatConfig)

the(thatState.FOO).should.equal('fuuuuu') - the(thatState).should.have.property('FOO').being.a(str) - the(thatState).should.have.property('BAR').being.a(str) + the(thatState).should.have.property('FOO').being.a(basestring) + the(thatState).should.have.property('BAR').being.a(basestring) the(thatState).should.have.property('LOGFILE').being.an(int) the(thatState.FOO).must.equal(thatConfig.FOO) the(thatState.BAR).must.equal(thatConfig.BAR)