Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix: printu prints unicode strings and objects

Browse Source 
* fix: use unicode() constructor instead of str() in several places
This commit is contained in:
Eray Özkural
2005-10-11 20:24:36 +00:00
parent 71ecd93802
commit be0696a5c1
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/cli/commands.py
+1 -1
View File
@@ -491,7 +491,7 @@ Usage: info <package1> <package2> ... <packagen>
import os.path import os.path
metadata, files = pisi.api.info(arg) metadata, files = pisi.api.info(arg)
ctx.ui.info(str(metadata.package)) ctx.ui.info(unicode(metadata.package))
if self.options.files or self.options.files_path: if self.options.files or self.options.files_path:
if files: if files:
ctx.ui.info(_('\nFiles:')) ctx.ui.info(_('\nFiles:'))
pisi/specfile.py
+1 -1
View File
@@ -369,7 +369,7 @@ class PackageInfo:
self.name, self.version, self.release, self.build) self.name, self.version, self.release, self.build)
s += _('\nSummary: ') + self.summary s += _('\nSummary: ') + self.summary
s += _('\nDescription: ') + self.description s += _('\nDescription: ') + self.description
s += _('\nComponent: ') + str(self.partof) s += _('\nComponent: ') + unicode(self.partof)
s += _('\nProvides: ') s += _('\nProvides: ')
for x in self.providesComar: for x in self.providesComar:
s += x.om s += x.om
pisi/xmlfile.py
+2 -1
View File
@@ -386,6 +386,7 @@ class autoxml(type):
def encode(xml, node, value, errs): def encode(xml, node, value, errs):
"""encode given value inside DOM node""" """encode given value inside DOM node"""
if value: if value:
#FIXME: unicode() here?
writetext(xml, node, token, str(value)) writetext(xml, node, token, str(value))
else: else:
if req == mandatory: if req == mandatory:
@@ -393,7 +394,7 @@ class autoxml(type):
def format(value, errs): def format(value, errs):
"""format value for pretty printing""" """format value for pretty printing"""
return str(value) return unicode(value)
return initialize, decode, encode, format return initialize, decode, encode, format
tools/repostats.py
+6 -4
View File
@@ -151,12 +151,14 @@ valid_filetypes = [
] ]
def printu(obj): def printu(obj):
if isinstance(obj, unicode): """smart print command which handles unicode strings and objects which
return unicode __str__'s, a common case in our implementation"""
if isinstance(obj, str):
print obj
elif isinstance(obj, unicode):
print obj.encode('utf-8') print obj.encode('utf-8')
elif isinstance(obj, str):
print obj.decode('utf-8')
else: else:
print str(obj) print unicode(obj).encode('utf-8') # this is printu!
def valuesort(x, y): def valuesort(x, y):
if x[1] > y[1]: if x[1] > y[1]: