Merge fdaec06 into fb916a9

stchris · Feb 25, 2021 · be4c20b · be4c20b
2 parents fb916a9 + fdaec06
commit be4c20b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ python:
     - 3.8
     - pypy
 install:
+  - pip install --upgrade pip
   - pip install coveralls
   - pip install tox
 script:

diff --git a/untangle.py b/untangle.py
@@ -173,8 +173,8 @@ def parse(filename, **parser_features):
     parses it and returns a Python object which represents the given
     document.
 
-    Extra arguments to this function are treated as feature values to pass
-    to ``parser.setFeature()``. For example, ``feature_external_ges=False``
+    Extra arguments to this function are treated as feature values that are
+    passed to ``parser.setFeature()``. For example, ``feature_external_ges=False``
     will set ``xml.sax.handler.feature_external_ges`` to False, disabling
     the parser's inclusion of external general (text) entities such as DTDs.