Checkbox Support Library

Merge ~sylvain-pineau/checkbox-support:fix-1850660 into checkbox-support:master

  1. Git
  2. lp:~sylvain-pineau/checkbox-support
  3. fix-1850660
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 9c3802963692e0ae01811aea8f57ca5a7271cddc
Merged at revision: cb5fa06a5ad0e3a0ead8647a93b77cab3ac4597f
Proposed branch: ~sylvain-pineau/checkbox-support:fix-1850660
Merge into: checkbox-support:master
Diff against target: 16 lines (+4/-1)
1 file modified
checkbox_support/parsers/pactl.py (+4/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+375479@code.launchpad.net

Description of the change

Fixes linked bug by reverting the API change introduced by pyparsing 2.3.1

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

self-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/checkbox_support/parsers/pactl.py b/checkbox_support/parsers/pactl.py
2index a7a31ba..6c10b64 100644
3--- a/checkbox_support/parsers/pactl.py
4+++ b/checkbox_support/parsers/pactl.py
5@@ -60,7 +60,10 @@ from collections import OrderedDict
6 from inspect import isroutine
7
8 import pyparsing as p
9-
10+try:
11+ p.__compat__.collect_all_And_tokens = False
12+except AttributeError:
13+ pass
14
15 # Enable packrat paring.
16 #

Subscribers

People subscribed via source and target branches