Skip to content
Permalink
Browse files

Merge pull request #2656 from jmchilton/pyparsing_testing

Import pyparsing in testing so twill's older version doesn't get loaded.
  • Loading branch information...
martenson committed Jul 26, 2016
2 parents 134f988 + 93ba35f commit 9607e528be01234b1107db29e0a910043d12507e
Showing with 4 additions and 0 deletions.
  1. +4 −0 test/base/twilltestcase.py
@@ -12,6 +12,10 @@
from json import loads
from xml.etree import ElementTree

# Be sure to use Galaxy's vanilla pyparsing instead of the older version
# imported by twill.
import pyparsing # noqa: F401

import twill
import twill.commands as tc
from markupsafe import escape

0 comments on commit 9607e52

Please sign in to comment.
You can’t perform that action at this time.