[meld/Python3: 23/54] util.compat: Remove string_types, update users, and remove util.compat
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/Python3: 23/54] util.compat: Remove string_types, update users, and remove util.compat
- Date: Sun, 1 May 2016 22:23:56 +0000 (UTC)
commit aee0896e474991af29844466cee5e4e2edcd2731
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Nov 14 07:11:38 2015 +1000
util.compat: Remove string_types, update users, and remove util.compat
meld/meldwindow.py | 3 +--
meld/util/compat.py | 5 -----
2 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index e72c41a..42c905a 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -33,7 +33,6 @@ from . import vcview
from .ui import gnomeglade
from .ui import notebooklabel
-from .util.compat import string_types
from meld.conf import _
from meld.recent import recent_comparisons
from meld.settings import interface_settings, settings
@@ -291,7 +290,7 @@ class MeldWindow(gnomeglade.Component):
def on_idle(self):
ret = self.scheduler.iteration()
- if ret and isinstance(ret, string_types):
+ if ret and isinstance(ret, str):
self.spinner.set_tooltip_text(ret)
pending = self.scheduler.tasks_pending()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]