Merge lp://staging/~vorlon/python-apt/pre-release-py3-ubuntu into lp://staging/~ubuntu-core-dev/python-apt/ubuntu
Proposed by
Steve Langasek
Status: | Merged |
---|---|
Approved by: | Barry Warsaw |
Approved revision: | 470 |
Merge reported by: | Steve Langasek |
Merged at revision: | not available |
Proposed branch: | lp://staging/~vorlon/python-apt/pre-release-py3-ubuntu |
Merge into: | lp://staging/~ubuntu-core-dev/python-apt/ubuntu |
Diff against target: |
52 lines (+17/-6) 3 files modified
debian/changelog (+9/-0) pre-build.sh (+3/-0) utils/get_ubuntu_mirrors_from_lp.py (+5/-6) |
To merge this branch: | bzr merge lp://staging/~vorlon/python-apt/pre-release-py3-ubuntu |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Barry Warsaw (community) | Approve | ||
Review via email:
|
Description of the change
branch to port pre-build.sh to python3 (at least half of it - the other half
needs python3-debian), and to make pre-build.sh behave more sensibly when
source-build-deps are missing
To post a comment you must log in.
On Jun 11, 2012, at 08:53 PM, Steve Langasek wrote:
>Steve Langasek has proposed merging lp:~vorlon/python-apt/pre-release-py3-ubuntu into lp:~ubuntu-core-dev/python-apt/ubuntu. foundations) /code.launchpad .net/~vorlon/ python- apt/pre- release- py3-ubuntu/ +merge/ 109733
>
>Requested reviews:
> Canonical Foundations Team (canonical-
>
>For more details, see:
>https:/
>
>branch to port pre-build.sh to python3 (at least half of it - the other half
>needs python3-debian), and to make pre-build.sh behave more sensibly when
>source-build-deps are missing
=== modified file 'utils/ get_ubuntu_ mirrors_ from_lp. py' ubuntu_ mirrors_ from_lp. py 2011-08-11 13:38:04 +0000 ubuntu_ mirrors_ from_lp. py 2012-06-11 20:52:18 +0000 lp_mirrors. py countrycode] .add(link. href) //mirrors. ubuntu. com/mirrors. txt" countries. keys())
--- utils/get_
+++ utils/get_
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python
> +#!/usr/bin/env python3
> #
> # get_ubuntu_
> #
> @@ -40,9 +40,8 @@
> countries[
>
>
> -keys = countries.keys()
> -keys.sort()
> -print "mirror:
> +keys = sorted(
Actually, you don't need the .keys() here since iteration over a dictionary by
definition iterates over its keys. So
keys = sorted(countries)
is the standard idiom.
> +print( "mirror: //mirrors. ubuntu. com/mirrors. txt") sorted( countries[ country] )) \n".join( sorted( countries[ country] )))
> for country in keys:
> - print "#LOC:%s" % country
> - print "\n".join(
> + print("#LOC:%s" % country)
> + print("