diff options
Diffstat (limited to 'libbe/bugdir.py')
| -rw-r--r-- | libbe/bugdir.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libbe/bugdir.py b/libbe/bugdir.py index 8b9e1e7..5738a80 100644 --- a/libbe/bugdir.py +++ b/libbe/bugdir.py @@ -186,7 +186,7 @@ class BugDir (list, settings_object.SavedSettingsObject): self.storage.get(self.id.storage('settings'), default='{}\n') try: settings = mapfile.parse(settings_mapfile) - except mapfile.InvalidMapfileContents, e: + except mapfile.InvalidMapfileContents as e: raise Exception('Invalid settings file for bugdir %s\n' '(BE version missmatch?)' % self.id.user()) self._setup_saved_settings(settings) @@ -438,7 +438,7 @@ class BugDir (list, settings_object.SavedSettingsObject): ... inactive_status_def=bug.inactive_status_def) >>> bugdirA.cleanup() """ - if type(xml_string) == types.UnicodeType: + if type(xml_string) == str: xml_string = xml_string.strip().encode('unicode_escape') if hasattr(xml_string, 'getchildren'): # already an ElementTree Element bugdir = xml_string @@ -500,7 +500,7 @@ class BugDir (list, settings_object.SavedSettingsObject): text = entries else: text = xml.sax.saxutils.unescape(child.text) - if not isinstance(text, unicode): + if not isinstance(text, str): text = text.decode('unicode_escape') text = text.strip() if child.tag == 'uuid' and not preserve_uuids: @@ -695,11 +695,11 @@ class RevisionedBugDir (BugDir): kwargs['revision'] = self.r return self.sget(*args, **kwargs) def ancestors(self, *args, **kwargs): - print 'getting ancestors', args, kwargs + print('getting ancestors', args, kwargs) if not 'revision' in kwargs or kwargs['revision'] == None: kwargs['revision'] = self.r ret = self.sancestors(*args, **kwargs) - print 'got ancestors', ret + print('got ancestors', ret) return ret def children(self, *args, **kwargs): if not 'revision' in kwargs or kwargs['revision'] == None: @@ -895,20 +895,20 @@ if libbe.TESTING == True: preexisting bugs. """ bugdir = SimpleBugDir(memory=False) - self.failUnless(bugdir.storage.is_readable() == True, + self.assertTrue(bugdir.storage.is_readable() == True, bugdir.storage.is_readable()) - self.failUnless(bugdir.storage.is_writeable() == True, + self.assertTrue(bugdir.storage.is_writeable() == True, bugdir.storage.is_writeable()) uuids = sorted([bug.uuid for bug in bugdir]) - self.failUnless(uuids == ['a', 'b'], uuids) + self.assertTrue(uuids == ['a', 'b'], uuids) bugdir.flush_reload() uuids = sorted(bugdir.uuids()) - self.failUnless(uuids == ['a', 'b'], uuids) + self.assertTrue(uuids == ['a', 'b'], uuids) uuids = sorted([bug.uuid for bug in bugdir]) - self.failUnless(uuids == [], uuids) + self.assertTrue(uuids == [], uuids) bugdir.load_all_bugs() uuids = sorted([bug.uuid for bug in bugdir]) - self.failUnless(uuids == ['a', 'b'], uuids) + self.assertTrue(uuids == ['a', 'b'], uuids) bugdir.cleanup() def testInMemoryCleanLoad(self): """ @@ -916,16 +916,16 @@ if libbe.TESTING == True: preexisting bugs. """ bugdir = SimpleBugDir(memory=True) - self.failUnless(bugdir.storage == None, bugdir.storage) + self.assertTrue(bugdir.storage == None, bugdir.storage) uuids = sorted([bug.uuid for bug in bugdir]) - self.failUnless(uuids == ['a', 'b'], uuids) + self.assertTrue(uuids == ['a', 'b'], uuids) uuids = sorted([bug.uuid for bug in bugdir]) - self.failUnless(uuids == ['a', 'b'], uuids) + self.assertTrue(uuids == ['a', 'b'], uuids) bugdir._clear_bugs() uuids = sorted(bugdir.uuids()) - self.failUnless(uuids == [], uuids) + self.assertTrue(uuids == [], uuids) uuids = sorted([bug.uuid for bug in bugdir]) - self.failUnless(uuids == [], uuids) + self.assertTrue(uuids == [], uuids) bugdir.cleanup() unitsuite =unittest.TestLoader().loadTestsFromModule(sys.modules[__name__]) |