[kernel] r18495 - dists/trunk/linux-2.6/debian/lib/python/debian_linux
Bastian Blank
waldi at alioth.debian.org
Wed Jan 11 20:01:56 UTC 2012
Author: waldi
Date: Wed Jan 11 20:01:55 2012
New Revision: 18495
Log:
* debian/lib/python/debian_linux/debian.py: Use unicode.
* debian/lib/python/debian_linux/gencontrol.py: Remove debugging code.
Modified:
dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py Wed Jan 11 18:41:47 2012 (r18494)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/debian.py Wed Jan 11 20:01:55 2012 (r18495)
@@ -150,7 +150,7 @@
self.linux_modifier = d['modifier']
self.linux_version = d['version']
if d['modifier'] is not None:
- self.linux_upstream = '-'.join((d['version'], d['modifier']))
+ self.linux_upstream = u'-'.join((d['version'], d['modifier']))
else:
self.linux_upstream = d['version']
self.linux_dfsg = d['dfsg']
@@ -176,7 +176,7 @@
return self._data.__len__()
def __unicode__(self):
- return ' '.join(sorted(self))
+ return u' '.join(sorted(self))
def add(self, value):
self._data.add(value)
@@ -205,12 +205,12 @@
def __unicode__(self):
wrap = utils.TextWrapper(width=74, fix_sentence_endings=True).wrap
- short = ', '.join(self.short)
+ short = u', '.join(self.short)
long_pars = []
for i in self.long:
long_pars.append(wrap(i))
- long = '\n .\n '.join(['\n '.join(i) for i in long_pars])
- return short + '\n ' + long
+ long = u'\n .\n '.join([u'\n '.join(i) for i in long_pars])
+ return short + u'\n ' + long
def append(self, str):
str = str.strip()
@@ -236,7 +236,7 @@
self.extend(value, override_arches)
def __unicode__(self):
- return ', '.join([unicode(i) for i in self])
+ return u', '.join((unicode(i) for i in self))
def _search_value(self, value):
for i in self:
@@ -257,9 +257,7 @@
def extend(self, value, override_arches=None):
if isinstance(value, basestring):
- value = [j.strip() for j in re.split(',', value.strip())]
- elif not isinstance(value, (list, tuple)):
- raise ValueError(u"got %s" % type(value))
+ value = (j.strip() for j in re.split(u',', value.strip()))
for i in value:
self.append(i, override_arches)
@@ -270,7 +268,7 @@
self.extend(value, override_arches)
def __unicode__(self):
- return ' | '.join([unicode(i) for i in self])
+ return u' | '.join((unicode(i) for i in self))
def _search_value(self, value):
for i, j in itertools.izip(self, value):
@@ -294,9 +292,7 @@
def extend(self, value, override_arches=None):
if isinstance(value, basestring):
- value = [j.strip() for j in re.split('\|', value.strip())]
- elif not isinstance(value, (list, tuple)):
- raise ValueError
+ value = (j.strip() for j in re.split('\|', value.strip()))
for i in value:
self.append(i, override_arches)
@@ -360,7 +356,7 @@
ret.extend((u' (', unicode(self.operator), u' ', self.version, u')'))
if self.arches:
ret.extend((u' [', u' '.join(self.arches), u']'))
- return ''.join(ret)
+ return u''.join(ret)
def parse(self, value):
match = self._re.match(value)
Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Wed Jan 11 18:41:47 2012 (r18494)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Wed Jan 11 20:01:55 2012 (r18495)
@@ -301,6 +301,5 @@
def write_rfc822(self, f, list):
for entry in list:
for key, value in entry.iteritems():
- print key, repr(unicode(value))
f.write(u"%s: %s\n" % (key, value))
f.write(u'\n')
More information about the Kernel-svn-changes
mailing list