Renaming token module to syntax.

dhermes · dhermes · commit fd1ef8c67e25 · 2016-08-29T13:02:37.000-07:00
diff --git a/docs/language-responses.rst b/docs/language-responses.rst
@@ -15,9 +15,9 @@ Sentiment
   :members:
   :show-inheritance:
 
-Tokens
+Syntax
 ~~~~~~
 
-.. automodule:: gcloud.language.token
+.. automodule:: gcloud.language.syntax
   :members:
   :show-inheritance:
diff --git a/docs/language-usage.rst b/docs/language-usage.rst
@@ -216,7 +216,7 @@ machine learning and need in-depth text features to build upon.
 The method returns a named tuple with four entries:
 
 * ``sentences``: A :class:`list` of sentences in the text
-* ``tokens``: A :class:`list` of :class:`~gcloud.language.token.Token`
+* ``tokens``: A :class:`list` of :class:`~gcloud.language.syntax.Token`
   object (e.g. words, punctuation)
 * ``sentiment``: The :class:`~gcloud.language.sentiment.Sentiment` of
   the text (as returned by
diff --git a/gcloud/language/document.py b/gcloud/language/document.py
@@ -21,8 +21,8 @@
 
 from gcloud.language.entity import Entity
 from gcloud.language.sentiment import Sentiment
-from gcloud.language.token import Sentence
-from gcloud.language.token import Token
+from gcloud.language.syntax import Sentence
+from gcloud.language.syntax import Token
 
 
 DEFAULT_LANGUAGE = 'en-US'
diff --git a/gcloud/language/syntax.py b/gcloud/language/syntax.py
diff --git a/gcloud/language/test_document.py b/gcloud/language/test_document.py
@@ -40,7 +40,7 @@ def _make_token_json(name, part_of_speech, head, edge_label):
 
 
 def _get_token_and_sentences(include_syntax):
-    from gcloud.language.token import PartOfSpeech
+    from gcloud.language.syntax import PartOfSpeech
 
     if include_syntax:
         token_info = [
@@ -279,7 +279,7 @@ def test_analyze_sentiment(self):
         self.assertEqual(req['method'], 'POST')
 
     def _verify_sentences(self, include_syntax, annotations):
-        from gcloud.language.token import Sentence
+        from gcloud.language.syntax import Sentence
 
         if include_syntax:
             self.assertEqual(len(annotations.sentences), 1)
@@ -291,7 +291,7 @@ def _verify_sentences(self, include_syntax, annotations):
             self.assertEqual(annotations.sentences, [])
 
     def _verify_tokens(self, annotations, token_info):
-        from gcloud.language.token import Token
+        from gcloud.language.syntax import Token
 
         self.assertEqual(len(annotations.tokens), len(token_info))
         for token, info in zip(annotations.tokens, token_info):
diff --git a/gcloud/language/test_syntax.py b/gcloud/language/test_syntax.py
@@ -18,7 +18,7 @@
 class TestPartOfSpeech(unittest.TestCase):
 
     def _getTargetClass(self):
-        from gcloud.language.token import PartOfSpeech
+        from gcloud.language.syntax import PartOfSpeech
         return PartOfSpeech
 
     def test_reverse(self):
@@ -36,14 +36,14 @@ def test_reverse(self):
 class TestToken(unittest.TestCase):
 
     def _getTargetClass(self):
-        from gcloud.language.token import Token
+        from gcloud.language.syntax import Token
         return Token
 
     def _makeOne(self, *args, **kw):
         return self._getTargetClass()(*args, **kw)
 
     def test_constructor(self):
-        from gcloud.language.token import PartOfSpeech
+        from gcloud.language.syntax import PartOfSpeech
 
         text_content = 'All'
         text_begin = -1
@@ -61,7 +61,7 @@ def test_constructor(self):
         self.assertEqual(token.lemma, lemma)
 
     def test_from_api_repr(self):
-        from gcloud.language.token import PartOfSpeech
+        from gcloud.language.syntax import PartOfSpeech
 
         klass = self._getTargetClass()
         text_content = 'pretty'
@@ -96,7 +96,7 @@ def test_from_api_repr(self):
 class TestSentence(unittest.TestCase):
 
     def _getTargetClass(self):
-        from gcloud.language.token import Sentence
+        from gcloud.language.syntax import Sentence
         return Sentence
 
     def _makeOne(self, *args, **kw):
