GNU Mailman

Merge lp:~raj-abhilash1/mailman/mailman_fix into lp:mailman

  1. mailman_fix
  2. Merge into 3.0
Proposed by Abhilash Raj
Status: Merged
Approved by: Barry Warsaw
Approved revision: no longer in the source branch.
Merged at revision: 7303
Proposed branch: lp:~raj-abhilash1/mailman/mailman_fix
Merge into: lp:mailman
Diff against target: 12 lines (+2/-2)
1 file modified
src/mailman/core/initialize.py (+2/-2)
To merge this branch: bzr merge lp:~raj-abhilash1/mailman/mailman_fix
Reviewer Review Type Date Requested Status
Mailman Coders Pending
Review via email: mp+252385@code.launchpad.net

Description of the change

Fix the error causing read error on MAILMAN_EXTRA_TESTING_CFG (for testing against postgres)

To post a comment you must log in.
lp:~raj-abhilash1/mailman/mailman_fix updated
7302. By Barry Warsaw

copybump should ignore .git directories. This isn't currently relevant for
Mailman, but I use this script for other repos.

7303. By Barry Warsaw

Fix a read used during the PostgreSQL tests.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mailman/core/initialize.py'
2--- src/mailman/core/initialize.py 2015-01-05 01:22:39 +0000
3+++ src/mailman/core/initialize.py 2015-03-09 23:33:44 +0000
4@@ -130,8 +130,8 @@
5 # PostgreSQL.
6 extra_cfg_path = os.environ.get('MAILMAN_EXTRA_TESTING_CFG')
7 if extra_cfg_path is not None:
8- with open(extra_cfg_path) as fp:
9- extra_cfg = fp.read().decode('utf-8')
10+ with open(extra_cfg_path, 'r', encoding='utf-8') as fp:
11+ extra_cfg = fp.read()
12 mailman.config.config.push('extra testing config', extra_cfg)
13
14