From 3fd547c2d0115ba6ccfb85f307768726c28304ab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 16 Jan 2009 16:44:55 +0100 Subject: * apt/__init__.py: - remove the future warning --- apt/__init__.py | 6 +++--- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apt/__init__.py b/apt/__init__.py index 05407aff..e3cfacbe 100644 --- a/apt/__init__.py +++ b/apt/__init__.py @@ -15,6 +15,6 @@ from apt_pkg import SizeToStr, TimeToStr, VersionCompare apt_pkg.init() -import warnings -warnings.warn("apt API not stable yet", FutureWarning) -del warnings +#import warnings +#warnings.warn("apt API not stable yet", FutureWarning) +#del warnings diff --git a/debian/changelog b/debian/changelog index 976c72da..860bacc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,8 @@ python-apt (0.7.9~exp1) experimental; urgency=low * setup.py: - build html/ help of the apt and aptsources modules into /usr/share/doc/python-apt/html + * apt/__init__.py: + - remove the future warning -- Michael Vogt Mon, 15 Dec 2008 14:29:47 +0100 -- cgit v1.2.3 From 96ba2a685e8f754d2917da88dc424ef71a99b2e8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 21 Jan 2009 21:44:04 +0100 Subject: aptsources/distro.py: fix fallout from the indent changes --- aptsources/distro.py | 125 +++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 63 deletions(-) diff --git a/aptsources/distro.py b/aptsources/distro.py index a28396b7..1d958132 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -78,69 +78,68 @@ class Distribution: # find the distro template for template in self.sourceslist.matcher.templates: - if self.is_codename(template.name) and\ - template.distribution == self.id: + if (self.is_codename(template.name) and + template.distribution == self.id): #print "yeah! found a template for %s" % self.description #print template.description, template.base_uri, \ # template.components self.source_template = template break - if self.source_template is None: - raise NoDistroTemplateException("Error: could not find a " + if self.source_template is None: + raise NoDistroTemplateException("Error: could not find a " "distribution template") - # find main and child sources - media = [] - comps = [] - cdrom_comps = [] - enabled_comps = [] - source_code = [] - for source in self.sourceslist.list: - if source.invalid == False and\ - self.is_codename(source.dist) and\ - source.template and\ - self.is_codename(source.template.name): - #print "yeah! found a distro repo: %s" % source.line - # cdroms need do be handled differently - if source.uri.startswith("cdrom:") and \ - source.disabled == False: - self.cdrom_sources.append(source) - cdrom_comps.extend(source.comps) - elif source.uri.startswith("cdrom:") and \ - source.disabled == True: - self.cdrom_sources.append(source) - elif source.type == self.binary_type and \ - source.disabled == False: - self.main_sources.append(source) - comps.extend(source.comps) - media.append(source.uri) - elif source.type == self.binary_type and \ - source.disabled == True: - self.disabled_sources.append(source) - elif source.type == self.source_type \ - and source.disabled == False: - self.source_code_sources.append(source) - elif source.type == self.source_type \ - and source.disabled == True: - self.disabled_sources.append(source) - if source.invalid == False and\ - source.template in self.source_template.children: - if source.disabled == False \ - and source.type == self.binary_type: - self.child_sources.append(source) - elif source.disabled == False \ - and source.type == self.source_type: - self.source_code_sources.append(source) - else: - self.disabled_sources.append(source) - self.download_comps = set(comps) - self.cdrom_comps = set(cdrom_comps) - enabled_comps.extend(comps) - enabled_comps.extend(cdrom_comps) - self.enabled_comps = set(enabled_comps) - self.used_media = set(media) - - self.get_mirrors() + # find main and child sources + media = [] + comps = [] + cdrom_comps = [] + enabled_comps = [] + source_code = [] + for source in self.sourceslist.list: + if (source.invalid == False and + self.is_codename(source.dist) and + source.template and + self.is_codename(source.template.name)): + #print "yeah! found a distro repo: %s" % source.line + # cdroms need do be handled differently + if (source.uri.startswith("cdrom:") and + source.disabled == False): + self.cdrom_sources.append(source) + cdrom_comps.extend(source.comps) + elif (source.uri.startswith("cdrom:") and + source.disabled == True): + self.cdrom_sources.append(source) + elif (source.type == self.binary_type and + source.disabled == False): + self.main_sources.append(source) + comps.extend(source.comps) + media.append(source.uri) + elif (source.type == self.binary_type and + source.disabled == True): + self.disabled_sources.append(source) + elif (source.type == self.source_type + and source.disabled == False): + self.source_code_sources.append(source) + elif (source.type == self.source_type and + source.disabled == True): + self.disabled_sources.append(source) + if (source.invalid == False and + source.template in self.source_template.children): + if (source.disabled == False + and source.type == self.binary_type): + self.child_sources.append(source) + elif (source.disabled == False + and source.type == self.source_type): + self.source_code_sources.append(source) + else: + self.disabled_sources.append(source) + self.download_comps = set(comps) + self.cdrom_comps = set(cdrom_comps) + enabled_comps.extend(comps) + enabled_comps.extend(cdrom_comps) + self.enabled_comps = set(enabled_comps) + self.used_media = set(media) + self.get_mirrors() def get_mirrors(self, mirror_template=None): """ @@ -217,15 +216,15 @@ class Distribution: # Store all available servers: # Name, URI, active mirrors = [] - if len(self.used_servers) < 1 or \ - (len(self.used_servers) == 1 and \ - compare_mirrors(self.used_servers[0], self.main_server)): + if (len(self.used_servers) < 1 or + (len(self.used_servers) == 1 and + compare_mirrors(self.used_servers[0], self.main_server))): mirrors.append([_("Main server"), self.main_server, True]) if self.nearest_server: mirrors.append([self._get_mirror_name(self.nearest_server), self.nearest_server, False]) - elif len(self.used_servers) == 1 and not \ - compare_mirrors(self.used_servers[0], self.main_server): + elif (len(self.used_servers) == 1 and not + compare_mirrors(self.used_servers[0], self.main_server)): mirrors.append([_("Main server"), self.main_server, False]) # Only one server is used server = self.used_servers[0] @@ -382,8 +381,8 @@ class Distribution: change_server_of_source(source, uri, seen_binary) for source in self.child_sources: # Do not change the forces server of a child source - if source.template.base_uri is None or \ - source.template.base_uri != source.uri: + if (source.template.base_uri is None or + source.template.base_uri != source.uri): change_server_of_source(source, uri, seen_binary) for source in self.source_code_sources: change_server_of_source(source, uri, seen_source) -- cgit v1.2.3 From ef6a647b219823bf75cace674904ade03079b2e5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 21 Jan 2009 22:42:26 +0100 Subject: * aptsources/distro.py: - use iso_3166.xml instead of iso_3166.tab * debian/control: - add Recommends to iso-codes (for iso_3166.xml) --- aptsources/distro.py | 29 ++++++++++++++++------------- debian/changelog | 9 +++++++++ debian/control | 1 + 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/aptsources/distro.py b/aptsources/distro.py index 1d958132..56e95339 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -26,6 +26,7 @@ import re import os import sys +from xml.etree.ElementTree import ElementTree import gettext @@ -161,16 +162,20 @@ class Distribution: # get a list of country codes and real names self.countries = {} - try: - f = open("/usr/share/iso-codes/iso_3166.tab", "r") - lines = f.readlines() - for line in lines: - parts = line.split("\t") - self.countries[parts[0].lower()] = parts[1].strip() - except: - print "could not open file '%s'" % file - else: - f.close() + fname = "/usr/share/xml/iso-codes/iso_3166.xml" + if os.path.exists(fname): + et = ElementTree(file=fname) + it = et.getiterator('iso_3166_entry') + for elm in it: + if elm.attrib.has_key("common_name"): + descr = elm.attrib["common_name"] + else: + descr = elm.attrib["name"] + if elm.attrib.has_key("alpha_2_code"): + code = elm.attrib["alpha_2_code"] + else: + code = elm.attrib["alpha_3_code"] + self.countries[code.lower()] = gettext.dgettext('iso_3166',descr) # try to guess the nearest mirror from the locale self.country = None @@ -199,9 +204,7 @@ class Distribution: country = server[i+len("://"):l] if country in self.countries: # TRANSLATORS: %s is a country - return _("Server for %s") % \ - gettext.dgettext("iso_3166", - self.countries[country].rstrip()).rstrip() + return _("Server for %s") % self.countries[country] else: return("%s" % server.rstrip("/ ")) diff --git a/debian/changelog b/debian/changelog index 860bacc5..8868468a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +python-apt (0.7.9~exp3) experimental; urgency=low + + * aptsources/distro.py: + - use iso_3166.xml instead of iso_3166.tab + * debian/control: + - add Recommends to iso-codes (for iso_3166.xml) + + -- + python-apt (0.7.9~exp2) experimental; urgency=low [ Julian Andres Klode ] diff --git a/debian/control b/debian/control index 0cb6e215..0fbc0205 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid Package: python-apt Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release +Recommends: iso-codes Priority: optional Provides: ${python:Provides} Suggests: python-apt-dbg, python-gtk2, python-vte -- cgit v1.2.3 From 9ecd5cc188487f6823fb450d1ef4aa3f97fcef7b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 22 Jan 2009 09:35:12 +0100 Subject: fix incorrect indent --- aptsources/distro.py | 60 ++++++++++++++++++++++++++-------------------------- debian/changelog | 1 + 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/aptsources/distro.py b/aptsources/distro.py index 56e95339..36ab0ff8 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -307,42 +307,42 @@ class Distribution: source.comps.append(comp) comps_per_dist[source.dist].add(comp) - sources = [] - sources.extend(self.main_sources) - sources.extend(self.child_sources) - # store what comps are enabled already per distro (where distro is - # e.g. "dapper", "dapper-updates") - comps_per_dist = {} - comps_per_sdist = {} - for s in sources: - if s.type == self.binary_type: - if s.dist not in comps_per_dist: - comps_per_dist[s.dist] = set() + sources = [] + sources.extend(self.main_sources) + sources.extend(self.child_sources) + # store what comps are enabled already per distro (where distro is + # e.g. "dapper", "dapper-updates") + comps_per_dist = {} + comps_per_sdist = {} + for s in sources: + if s.type == self.binary_type: + if s.dist not in comps_per_dist: + comps_per_dist[s.dist] = set() map(comps_per_dist[s.dist].add, s.comps) - for s in self.source_code_sources: - if s.type == self.source_type: - if s.dist not in comps_per_sdist: - comps_per_sdist[s.dist] = set() + for s in self.source_code_sources: + if s.type == self.source_type: + if s.dist not in comps_per_sdist: + comps_per_sdist[s.dist] = set() map(comps_per_sdist[s.dist].add, s.comps) - # check if there is a main source at all - if len(self.main_sources) < 1: + # check if there is a main source at all + if len(self.main_sources) < 1: + # create a new main source + self.add_source(comps=["%s"%comp]) + else: + # add the comp to all main, child and source code sources + for source in sources: + add_component_only_once(source, comps_per_dist) + + # check if there is a main source code source at all + if self.get_source_code == True: + if len(self.source_code_sources) < 1: # create a new main source - self.add_source(comps=["%s"%comp]) + self.add_source(type=self.source_type, comps=["%s"%comp]) else: # add the comp to all main, child and source code sources - for source in sources: - add_component_only_once(source, comps_per_dist) - - # check if there is a main source code source at all - if self.get_source_code == True: - if len(self.source_code_sources) < 1: - # create a new main source - self.add_source(type=self.source_type, comps=["%s"%comp]) - else: - # add the comp to all main, child and source code sources - for source in self.source_code_sources: - add_component_only_once(source, comps_per_sdist) + for source in self.source_code_sources: + add_component_only_once(source, comps_per_sdist) def disable_component(self, comp): """ diff --git a/debian/changelog b/debian/changelog index 8868468a..400b15f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ python-apt (0.7.9~exp3) experimental; urgency=low * aptsources/distro.py: - use iso_3166.xml instead of iso_3166.tab + - fix incorrect indent * debian/control: - add Recommends to iso-codes (for iso_3166.xml) -- cgit v1.2.3