~pappacena/launchpad:allow-mp-between-personal-repos

Branch merges

Propose for merging

Merged into launchpad:master

Colin Watson (community): Approve on 2020-07-21

Diff: 163 lines (+60/-12)

5 files modified

lib/lp/code/browser/gitref.py (+21/-1)
lib/lp/code/browser/tests/test_gitref.py (+12/-1)
lib/lp/code/model/gitnamespace.py (+1/-1)
lib/lp/code/model/tests/test_gitnamespace.py (+19/-9)
lib/lp/code/templates/gitref-pending-merges.pt (+7/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

31dfe63... by Thiago F. Pappacena on 2020-07-23

fixing typo

bbca8aa... by Thiago F. Pappacena on 2020-07-21

Coding style and better guard on merge proposal creation notes

c2a29d1... by Thiago F. Pappacena on 2020-07-21

Allowing users to propose merge between personal git repositories

bd12e33... by Colin Watson on 2020-07-21

Port native-string streams to six.StringIO

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/387726

dc8ab9f... by Colin Watson on 2020-07-21

Port native-string streams to six.StringIO

Of the streams that were created using StringIO.StringIO or
cStringIO.StringIO, a number of them (mainly things like log files)
accept native strings on both Python 2 and 3. Port these to
six.StringIO for compatibility with Python 3.

7a9f57b... by Colin Watson on 2020-07-21

Use context managers instead of open().{read,write}()

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/387723

2eeab55... by Colin Watson on 2020-07-20

Use context managers instead of open().{read,write}()

This fixes ResourceWarnings on Python 3.

fbc4e03... by Colin Watson on 2020-07-20

Fix LimitedList for Python 3

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/387707

79243f7... by Colin Watson on 2020-07-20

Use six.python_2_unicode_compatible

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/387710

3639ded... by Colin Watson on 2020-07-20

Use six.python_2_unicode_compatible

Where appropriate, this makes it easier to define __str__ and
__unicode__ for Python 2 and only __str__ for Python 3.

In some places we define __unicode__ only to deliberately mark it as not
implemented. However, those are related to URLs, where it seems to make
sense to define whatever the native __str__ is on each version, so mark
the __unicode__ definition as Python-2-only.