From b99fdaf67a70730bd43f5dbe441771b274d1db71 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Thu, 17 Jan 2013 00:27:29 +0100 Subject: revert the python3 port - it currently hangs, needs some help. --- render-icon-theme.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/render-icon-theme.py b/render-icon-theme.py index 2c61b594c..7888e45ad 100755 --- a/render-icon-theme.py +++ b/render-icon-theme.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python import os import sys @@ -69,7 +69,7 @@ class ContentHandler(xml.sax.ContentHandler): self.inside.append(self.SVG) return elif self.inside[-1] == self.SVG: - if (name == "g" and ('inkscape:groupmode' in attrs) and ('inkscape:label' in attrs) + if (name == "g" and attrs.has_key('inkscape:groupmode') and attrs.has_key('inkscape:label') and attrs['inkscape:groupmode'] == 'layer' and attrs['inkscape:label'].startswith('baseplate')): self.stack.append(self.LAYER) self.inside.append(self.LAYER) @@ -78,13 +78,13 @@ class ContentHandler(xml.sax.ContentHandler): self.rects = [] return elif self.inside[-1] == self.LAYER: - if name == "text" and ('inkscape:label' in attrs) and attrs['inkscape:label'] == 'context': + if name == "text" and attrs.has_key('inkscape:label') and attrs['inkscape:label'] == 'context': self.stack.append(self.TEXT) self.inside.append(self.TEXT) self.text='context' self.chars = "" return - elif name == "text" and ('inkscape:label' in attrs) and attrs['inkscape:label'] == 'icon-name': + elif name == "text" and attrs.has_key('inkscape:label') and attrs['inkscape:label'] == 'icon-name': self.stack.append(self.TEXT) self.inside.append(self.TEXT) self.text='icon-name' @@ -115,7 +115,7 @@ class ContentHandler(xml.sax.ContentHandler): if self.filter is not None and not self.icon_name in self.filter: return - print (self.context, ' ', self.icon_name) + print '%s %s' % (self.context, self.icon_name) for rect in self.rects: width = rect['width'] height = rect['height'] @@ -147,7 +147,7 @@ class ContentHandler(xml.sax.ContentHandler): if len(sys.argv) == 1: if not os.path.exists('gnome'): os.mkdir('gnome') - print ('Rendering from SVGs in ', SRC) + print 'Rendering from SVGs in %s' % SRC for file in os.listdir(SRC): if file[-4:] == '.svg': file = os.path.join(SRC, file) @@ -163,7 +163,7 @@ else: handler = ContentHandler(file, True, filter=icons) xml.sax.parse(open(file), handler) else: - print ("Error: No such file ", file) + print "Error: No such file %s" % file sys.exit(1) -- cgit v1.2.1