Merge pull request #5473 from explosion/fix/travis-tests

Fix Python 2.7 compat

spacy/lang/zh/__init__.py

@@ -169,21 +169,16 @@ class ChineseTokenizer(DummyTokenizer):
         return util.to_bytes(serializers, [])
 
     def from_bytes(self, data, **kwargs):
-        pkuseg_features_b = b""
-        pkuseg_weights_b = b""
-        pkuseg_processors_data = None
+        pkuseg_data = {"features_b": b"", "weights_b": b"", "processors_data": None}
 
         def deserialize_pkuseg_features(b):
-            nonlocal pkuseg_features_b
-            pkuseg_features_b = b
+            pkuseg_data["features_b"] = b
 
         def deserialize_pkuseg_weights(b):
-            nonlocal pkuseg_weights_b
-            pkuseg_weights_b = b
+            pkuseg_data["weights_b"] = b
 
         def deserialize_pkuseg_processors(b):
-            nonlocal pkuseg_processors_data
-            pkuseg_processors_data = srsly.msgpack_loads(b)
+            pkuseg_data["processors_data"] = srsly.msgpack_loads(b)
 
         deserializers = OrderedDict(
             (
@@ -195,13 +190,13 @@ class ChineseTokenizer(DummyTokenizer):
         )
         util.from_bytes(data, deserializers, [])
 
-        if pkuseg_features_b and pkuseg_weights_b:
+        if pkuseg_data["features_b"] and pkuseg_data["weights_b"]:
             with tempfile.TemporaryDirectory() as tempdir:
                 tempdir = Path(tempdir)
                 with open(tempdir / "features.pkl", "wb") as fileh:
-                    fileh.write(pkuseg_features_b)
+                    fileh.write(pkuseg_data["features_b"])
                 with open(tempdir / "weights.npz", "wb") as fileh:
-                    fileh.write(pkuseg_weights_b)
+                    fileh.write(pkuseg_data["weights_b"])
                 try:
                     import pkuseg
                 except ImportError:
@@ -210,13 +205,9 @@ class ChineseTokenizer(DummyTokenizer):
                         + _PKUSEG_INSTALL_MSG
                     )
                 self.pkuseg_seg = pkuseg.pkuseg(str(tempdir))
-            if pkuseg_processors_data:
-                (
-                    user_dict,
-                    do_process,
-                    common_words,
-                    other_words,
-                ) = pkuseg_processors_data
+            if pkuseg_data["processors_data"]:
+                processors_data = pkuseg_data["processors_data"]
+                (user_dict, do_process, common_words, other_words) = processors_data
                 self.pkuseg_seg.preprocesser = pkuseg.Preprocesser(user_dict)
                 self.pkuseg_seg.postprocesser.do_process = do_process
                 self.pkuseg_seg.postprocesser.common_words = set(common_words)

spacy/tests/lang/hy/test_text.py

@@ -1,3 +1,4 @@
+# coding: utf8
 from __future__ import unicode_literals
 
 import pytest