Merge lp:~jelmer/qbrz/trunk into lp:qbrz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Robert Ladyman
Approved revision: 1645
Merged at revision: 1649
Proposed branch: lp:~jelmer/qbrz/trunk
Merge into: lp:qbrz
Diff against target: 58 lines (+5/-4)
4 files modified
lib/subprocess.py (+2/-1)
lib/tests/test_subprocess.py (+1/-1)
run-tests.sh (+1/-1)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/qbrz/trunk
Reviewer Review Type Date Requested Status
Robert Ladyman Approve
Review via email: mp+419459@code.launchpad.net

Commit message

Use fastbencode rather than breezy.bencode.

Description of the change

Use fastbencode rather than breezy.bencode.

The latter is removed in Breezy trunk.

To post a comment you must log in.
Revision history for this message
Robert Ladyman (saccadic-masking) wrote :

OK - I had to rewrite some of the old bencode anyway (for Python 3) so using a lib is better.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/subprocess.py'
2--- lib/subprocess.py 2021-01-05 14:53:28 +0000
3+++ lib/subprocess.py 2022-04-14 11:35:51 +0000
4@@ -52,6 +52,8 @@
5 # Python 3
6 QString = str
7
8+import fastbencode as bencode
9+
10 lazy_import(globals(), '''
11 import codecs
12 import re
13@@ -61,7 +63,6 @@
14 import thread
15
16 from breezy import (
17- bencode,
18 commands,
19 errors,
20 osutils,
21
22=== modified file 'lib/tests/test_subprocess.py'
23--- lib/tests/test_subprocess.py 2021-01-06 09:56:48 +0000
24+++ lib/tests/test_subprocess.py 2022-04-14 11:35:51 +0000
25@@ -19,10 +19,10 @@
26 # along with this program; if not, write to the Free Software
27 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
28
29+import fastbencode as bencode
30 from io import StringIO
31
32 from breezy import (
33- bencode,
34 errors,
35 progress,
36 urlutils,
37
38=== modified file 'run-tests.sh'
39--- run-tests.sh 2020-05-23 08:31:34 +0000
40+++ run-tests.sh 2022-04-14 11:35:51 +0000
41@@ -1,3 +1,3 @@
42 #!/bin/sh
43 # bzr selftest -s bzrlib.plugins.qbrz $@
44-brz selftest -s brzlib.plugins.qbrz $@
45\ No newline at end of file
46+brz selftest -s breezy.plugins.qbrz $@
47
48=== modified file 'setup.py'
49--- setup.py 2022-01-07 17:34:19 +0000
50+++ setup.py 2022-04-14 11:35:51 +0000
51@@ -53,6 +53,6 @@
52 ],
53 ext_modules=ext_modules,
54 cmdclass=cmdclass,
55- install_requires = ['patiencediff', 'breezy'],
56+ install_requires = ['patiencediff', 'breezy', 'fastbencode'],
57
58 )

Subscribers

People subscribed via source and target branches

to all changes: