lp:~cyphermox/software-properties/unbreak-stuff

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:software-properties at revision 768

Colin Watson: Approve on 2012-07-05

Diff: 478 lines (+97/-22)

23 files modified

add-apt-repository (+3/-1)
debian/changelog (+8/-2)
debian/control (+13/-0)
debian/python-software-properties.install (+1/-0)
debian/rules (+1/-1)
software-properties-kde (+2/-0)
softwareproperties/AptAuth.py (+2/-0)
softwareproperties/MirrorTest.py (+8/-3)
softwareproperties/SoftwareProperties.py (+2/-0)
softwareproperties/dbus/SoftwarePropertiesDBus.py (+16/-9)
softwareproperties/gtk/DialogAddSourcesList.py (+2/-0)
softwareproperties/gtk/DialogEdit.py (+2/-0)
softwareproperties/gtk/SoftwarePropertiesGtk.py (+2/-0)
softwareproperties/gtk/utils.py (+2/-0)
softwareproperties/kde/CdromProgress.py (+2/-0)
softwareproperties/kde/DialogAdd.py (+2/-0)
softwareproperties/kde/DialogEdit.py (+2/-0)
softwareproperties/kde/DialogMirror.py (+2/-0)
softwareproperties/kde/SoftwarePropertiesKDE.py (+2/-0)
softwareproperties/ppa.py (+16/-5)
tests/Makefile (+3/-1)
tests/test_aptsources.py (+2/-0)
tests/test_dbus.py (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

768. By Mathieu Trudel-Lapierre on 2012-07-05

* Start producing python-software-properties again, until such time as it
  has no reverse-dependencies.
* Fix things so that reverse-depends can still work with Python 2.

767. By Mathieu Trudel-Lapierre on 2012-07-05

add-apt-repository: cast web_link to a string so the property can be displayed
from unicode in python2; for python3 this makes no difference.

766. By Mathieu Trudel-Lapierre on 2012-07-05

tests: test both python2 and python3.

765. By Mathieu Trudel-Lapierre on 2012-07-05

SoftwarePropertiesDBus: fixup so that it works for both python2 and python3.

764. By Mathieu Trudel-Lapierre on 2012-07-05

Revert removing the imports, fix pycurl pyflakes warning (still looking
for a pycurl error when the code now uses urllib).

763. By Colin Watson on 2012-07-05

Open /dev/urandom in binary mode.

762. By Colin Watson on 2012-07-05

releasing version 0.85

761. By Colin Watson on 2012-07-05

Ship add-apt-repository and its manual page only in
software-properties-common, rather than having bits of it in
python3-software-properties as well (LP: #1021122).

760. By Mathieu Trudel-Lapierre on 2012-07-04

releasing version 0.84

759. By Mathieu Trudel-Lapierre on 2012-07-04

(merge lp:~mathieu-tl/software-properties/port-to-python3)
Complete the port to python3.