[pitivi] Use glib.markup_escape_text
- From: Jean-FranÃois Fortin Tam <jfft src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Use glib.markup_escape_text
- Date: Sun, 5 Aug 2012 17:24:58 +0000 (UTC)
commit 71c0731663d0e44afb2e26b5229fed6560c4722f
Author: Renà Stadler <mail renestadler de>
Date: Sat Aug 4 18:31:19 2012 +0200
Use glib.markup_escape_text
No need to import sax just for this one function. Should help startup time a
little.
pitivi/effects.py | 3 ++-
pitivi/transitions.py | 9 +++++----
pitivi/utils/ui.py | 5 +++--
3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/effects.py b/pitivi/effects.py
index 2a0f4c5..acafb27 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -34,6 +34,7 @@ Effects global handling
that are too cumbersome to use as such
_ Complex Audio/Video Effects
"""
+import glib
import gst
import gtk
import re
@@ -44,7 +45,6 @@ import pango
from gettext import gettext as _
-from xml.sax.saxutils import escape
from pitivi.configure import get_pixmap_dir
from pitivi.settings import GlobalSettings
@@ -457,6 +457,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
cell.props.markup = "<b>%s</b>\n%s" % (escape(name),
escape(desc),)
diff --git a/pitivi/transitions.py b/pitivi/transitions.py
index 8055380..be295cf 100644
--- a/pitivi/transitions.py
+++ b/pitivi/transitions.py
@@ -21,12 +21,12 @@
# Boston, MA 02110-1301, USA.
import ges
+import glib
import gtk
import os
import gobject
from gettext import gettext as _
-from xml.sax.saxutils import escape
from pitivi.configure import get_pixmap_dir
from pitivi.utils.loggable import Loggable
@@ -359,9 +359,10 @@ class TransitionsListWidget(Signallable, gtk.VBox, Loggable):
icon = self.modelFilter.get_value(context[2], COL_ICON)
self._current_tooltip_icon = icon
- longname = escape(self.modelFilter.get_value(context[2], COL_NAME_TEXT).strip())
- description = escape(self.modelFilter.get_value(context[2], COL_DESC_TEXT))
- txt = "<b>%s:</b>\n%s" % (longname, description)
+ longname = self.modelFilter.get_value(context[2], COL_NAME_TEXT).strip()
+ description = self.modelFilter.get_value(context[2], COL_DESC_TEXT)
+ 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 837c456..1e35b49 100644
--- a/pitivi/utils/ui.py
+++ b/pitivi/utils/ui.py
@@ -25,6 +25,7 @@
UI utilities. This file contain the UI constants, and various functions and
classes that help with UI drawing around the application
"""
+import glib
import gst
import gtk
import os
@@ -33,7 +34,6 @@ import cairo
from itertools import izip
from urllib import unquote
from gettext import ngettext, gettext as _
-from xml.sax.saxutils import escape
from decimal import Decimal
from pitivi.utils.loggable import doLog, ERROR
@@ -188,7 +188,8 @@ def beautify_info(info):
def info_name(info):
"""Return a human-readable filename (without the path and quoting)."""
- return escape(unquote(os.path.basename(info.get_uri())))
+ filename = unquote(os.path.basename(info.get_uri()))
+ return glib.markup_escape_text(filename)
def beautify_stream(stream):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]