Launchpad itself

Merge lp:~mwhudson/launchpad/bzr.1.18dev-vs-our-uifactory into lp:launchpad

  1. bzr.1.18dev-vs-our-uifactory
  2. Merge into devel
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mwhudson/launchpad/bzr.1.18dev-vs-our-uifactory
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~mwhudson/launchpad/bzr.1.18dev-vs-our-uifactory
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Canonical Launchpad Engineering Pending
Review via email: mp+9736@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

This simple branches fixes an incompatibility with bzr.dev: the constructor of TextUIFactory lost an argument and as all the default values are OK for us, I think we should just use that.

Revision history for this message
Tim Penhey (thumper) wrote :

Seems entirely reasonable.

Why add bzr.dev to .bzrignore?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2009-07-01 21:52:53 +0000
3+++ .bzrignore 2009-08-05 23:08:37 +0000
4@@ -49,3 +49,4 @@
5 ./download-cache
6 ./_pythonpath.py
7 ./production-configs
8+bzr.dev
9
10=== modified file 'lib/lp/codehosting/codeimport/uifactory.py'
11--- lib/lp/codehosting/codeimport/uifactory.py 2009-07-17 00:26:05 +0000
12+++ lib/lp/codehosting/codeimport/uifactory.py 2009-08-06 03:31:15 +0000
13@@ -20,14 +20,9 @@
14 (by default).
15 """
16
17- def __init__(self, bar_type=None, stdin=None, stdout=None, stderr=None,
18- time_source=time.time, writer=None, interval=60.0):
19+ def __init__(self, time_source=time.time, writer=None, interval=60.0):
20 """Construct a `LoggingUIFactory`.
21
22- :param bar_type: See `TextUIFactory.__init__`.
23- :param stdin: See `TextUIFactory.__init__`.
24- :param stdout: See `TextUIFactory.__init__`.
25- :param stderr: See `TextUIFactory.__init__`.
26 :param time_source: A callable that returns time in seconds since the
27 epoch. Defaults to ``time.time`` and should be replaced with
28 something deterministic in tests.
29@@ -36,7 +31,7 @@
30 :param interval: Don't produce output more often than once every this
31 many seconds. Defaults to 60 seconds.
32 """
33- TextUIFactory.__init__(self, bar_type, stdin, stdout, stderr)
34+ TextUIFactory.__init__(self)
35 self.interval = interval
36 self._progress_view = LoggingTextProgressView(
37 time_source, writer, interval)