[pitivi] Drop use of old "glib" module
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Drop use of old "glib" module
- Date: Thu, 31 Oct 2013 01:15:41 +0000 (UTC)
commit da87a41ce112bd2521812ae7665e6fe6c347e4d4
Author: Colin Walters <walters verbum org>
Date: Wed Oct 30 18:53:50 2013 -0400
Drop use of old "glib" module
It's not shipped in gnome-continuous, and we were just using
it for markup_escape_text which works fine via gi.repository.GLib.
https://bugzilla.gnome.org/show_bug.cgi?id=711184
pitivi/effects.py | 3 +--
pitivi/transitions.py | 5 ++---
pitivi/utils/ui.py | 3 +--
3 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/effects.py b/pitivi/effects.py
index 7a05835..9994642 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -34,7 +34,6 @@ Effects global handling
that are too cumbersome to use as such
_ Complex Audio/Video Effects
"""
-import glib
import re
import os
import time
@@ -461,7 +460,7 @@ class EffectListWidget(Gtk.VBox, Loggable):
def view_description_cell_data_func(column, cell, model, iter_, data):
name, desc = model.get(iter_, COL_NAME_TEXT, COL_DESC_TEXT)
- escape = glib.markup_escape_text
+ escape = GLib.markup_escape_text
cell.props.markup = "<b>%s</b>\n%s" % (escape(name),
escape(desc),)
diff --git a/pitivi/transitions.py b/pitivi/transitions.py
index 08f7aab..a248585 100644
--- a/pitivi/transitions.py
+++ b/pitivi/transitions.py
@@ -20,7 +20,6 @@
# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301, USA.
-import glib
import os
from gi.repository import GLib
@@ -336,8 +335,8 @@ class TransitionsListWidget(Signallable, Gtk.VBox, Loggable):
longname = model.get_value(iter_, COL_NAME_TEXT).strip()
description = model.get_value(iter_, COL_DESC_TEXT)
- txt = "<b>%s:</b>\n%s" % (glib.markup_escape_text(longname),
- glib.markup_escape_text(description),)
+ txt = "<b>%s:</b>\n%s" % (GLib.markup_escape_text(longname),
+ GLib.markup_escape_text(description),)
tooltip.set_markup(txt)
return True
diff --git a/pitivi/utils/ui.py b/pitivi/utils/ui.py
index 7278b4b..5bd0701 100644
--- a/pitivi/utils/ui.py
+++ b/pitivi/utils/ui.py
@@ -37,7 +37,6 @@ from gi.repository.GstPbutils import DiscovererVideoInfo, DiscovererAudioInfo,\
from itertools import izip
from urllib import unquote
import cairo
-import glib
import os
from pitivi.utils.loggable import doLog, ERROR
@@ -204,7 +203,7 @@ def info_name(info):
filename = unquote(os.path.basename(info.get_id()))
else:
filename = unquote(os.path.basename(info.get_uri()))
- return glib.markup_escape_text(filename)
+ return GLib.markup_escape_text(filename)
def beautify_stream(stream):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]