Removed module import from test_usd.py

1 files changed, 297 insertions, 312 deletions

diff --git a/tests/test_usd.py b/tests/test_usd.py
index 3b2ecb20..03aec0df 100644
--- a/tests/test_usd.py
+++ b/tests/test_usd.py
@@ -6,7 +6,9 @@
 import textwrap
 import unittest
 
-from pygments import lexers, token
+from pygments import UsdLexer
+from pygments.token import Keyword, Literal, Name, Operator, Punctuation, \
+    String, Text
 
 
 class _Common(unittest.TestCase):
@@ -14,7 +16,7 @@ class _Common(unittest.TestCase):
 
     def setUp(self):
         """Create a fresh USD lexer class before each test runs."""
-        self.lexer = lexers.UsdLexer()
+        self.lexer = UsdLexer()
 
     def _get(self, code):
         """Tokenize the code into its unique parts.
@@ -41,8 +43,8 @@ class Features(_Common):
             r"@file://SPECI__Z-_ALIZED(syntax_here)?with_arbitrary#)(%*&)\characters.tar.gz@",
         ]:
             expected = [
-                (token.String.Interpol, path),
-                (token.Text, "\n"),
+                (String.Interpol, path),
+                (Text, "\n"),
             ]
 
             self.assertEqual(expected, self._get(path))
@@ -54,14 +56,13 @@ class Features(_Common):
             "</some/another_one/here>",
             "</some/path/here.property_name>",
             "</some/path/here>",
-
             # Relative paths
             "<../some/another_one/here>",
             "<../some/path/here.property_name>",
             "<../some/path/here>",
         ]:
             self.assertEqual(
-                [(token.Name.Namespace, code), (token.Text, "\n")], self._get(code),
+                [(Name.Namespace, code), (Text, "\n")], self._get(code),
             )
 
     def test_attribute(self):
@@ -70,14 +71,14 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Type, "double"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Name.Attribute, "foo"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Operator, "="),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "8.0"),
-                (token.Token.Text, "\n"),
+                (Keyword.Type, "double"),
+                (Text.Whitespace, " "),
+                (Name.Attribute, "foo"),
+                (Text.Whitespace, " "),
+                (Operator, "="),
+                (Text, " "),
+                (Literal.Number, "8.0"),
+                (Text, "\n"),
             ],
             self._get(normal),
         )
@@ -86,16 +87,16 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Token, "custom"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Keyword.Type, "double"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Name.Attribute, "foo"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Operator, "="),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "8.0"),
-                (token.Token.Text, "\n"),
+                (Keyword.Token, "custom"),
+                (Text.Whitespace, " "),
+                (Keyword.Type, "double"),
+                (Text.Whitespace, " "),
+                (Name.Attribute, "foo"),
+                (Text.Whitespace, " "),
+                (Operator, "="),
+                (Text, " "),
+                (Literal.Number, "8.0"),
+                (Text, "\n"),
             ],
             self._get(custom),
         )
@@ -104,16 +105,16 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Token, "uniform"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Keyword.Type, "double"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Name.Attribute, "foo"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Operator, "="),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "8.0"),
-                (token.Token.Text, "\n"),
+                (Keyword.Token, "uniform"),
+                (Text.Whitespace, " "),
+                (Keyword.Type, "double"),
+                (Text.Whitespace, " "),
+                (Name.Attribute, "foo"),
+                (Text.Whitespace, " "),
+                (Operator, "="),
+                (Text, " "),
+                (Literal.Number, "8.0"),
+                (Text, "\n"),
             ],
             self._get(uniform),
         )
@@ -122,18 +123,18 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Token, "custom"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Keyword.Token, "uniform"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Keyword.Type, "double"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Name.Attribute, "foo"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Operator, "="),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "8.0"),
-                (token.Token.Text, "\n"),
+                (Keyword.Token, "custom"),
+                (Text.Whitespace, " "),
+                (Keyword.Token, "uniform"),
+                (Text.Whitespace, " "),
+                (Keyword.Type, "double"),
+                (Text.Whitespace, " "),
+                (Name.Attribute, "foo"),
+                (Text.Whitespace, " "),
+                (Operator, "="),
+                (Text, " "),
+                (Literal.Number, "8.0"),
+                (Text, "\n"),
             ],
             self._get(custom_uniform),
         )
@@ -142,16 +143,16 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Token, "custom"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Keyword.Type, "double"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Name.Attribute, "foo_underscore_name"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Operator, "="),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "8.0"),
-                (token.Token.Text, "\n"),
+                (Keyword.Token, "custom"),
+                (Text.Whitespace, " "),
+                (Keyword.Type, "double"),
+                (Text.Whitespace, " "),
+                (Name.Attribute, "foo_underscore_name"),
+                (Text.Whitespace, " "),
+                (Operator, "="),
+                (Text, " "),
+                (Literal.Number, "8.0"),
+                (Text, "\n"),
             ],
             self._get(underscore),
         )
@@ -160,22 +161,22 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Type, "double[]"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Name.Attribute, "foo_underscore_name"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Operator, "="),
-                (token.Token.Text, " "),
-                (token.Token.Punctuation, "["),
-                (token.Token.Literal.Number, "10.1"),
-                (token.Token.Generic, ","),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "12.0"),
-                (token.Token.Generic, ","),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "13"),
-                (token.Token.Punctuation, "]"),
-                (token.Token.Text, "\n"),
+                (Keyword.Type, "double[]"),
+                (Text.Whitespace, " "),
+                (Name.Attribute, "foo_underscore_name"),
+                (Text.Whitespace, " "),
+                (Operator, "="),
+                (Text, " "),
+                (Punctuation, "["),
+                (Literal.Number, "10.1"),
+                (Generic, ","),
+                (Text, " "),
+                (Literal.Number, "12.0"),
+                (Generic, ","),
+                (Text, " "),
+                (Literal.Number, "13"),
+                (Punctuation, "]"),
+                (Text, "\n"),
             ],
             self._get(array),
         )
@@ -184,22 +185,22 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Type, "double[]"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Name.Attribute, "primvar:foo_thing"),
-                (token.Token.Text.Whitespace, " "),
-                (token.Token.Operator, "="),
-                (token.Token.Text, " "),
-                (token.Token.Punctuation, "["),
-                (token.Token.Literal.Number, "10.1"),
-                (token.Token.Generic, ","),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "12.0"),
-                (token.Token.Generic, ","),
-                (token.Token.Text, " "),
-                (token.Token.Literal.Number, "13"),
-                (token.Token.Punctuation, "]"),
-                (token.Token.Text, "\n"),
+                (Keyword.Type, "double[]"),
+                (Text.Whitespace, " "),
+                (Name.Attribute, "primvar:foo_thing"),
+                (Text.Whitespace, " "),
+                (Operator, "="),
+                (Text, " "),
+                (Punctuation, "["),
+                (Literal.Number, "10.1"),
+                (Generic, ","),
+                (Text, " "),
+                (Literal.Number, "12.0"),
+                (Generic, ","),
+                (Text, " "),
+                (Literal.Number, "13"),
+                (Punctuation, "]"),
+                (Text, "\n"),
             ],
             self._get(namespaced),
         )
@@ -216,66 +217,66 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Token, u"custom"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Keyword.Type, u"int[]"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Name.Attribute, u"foo"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"["),
-                (token.Token.Literal.Number, u"8"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"10"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"14"),
-                (token.Token.Punctuation, u"]"),
-                (token.Token.Text, u"\n"),
-                (token.Token.Keyword.Token, u"custom"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Keyword.Type, u"int[]"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Name.Attribute, u"foo"),
-                (token.Generic, u"."),
-                (token.Name.Keyword.Tokens, u"timeSamples"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"{"),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Literal.Number, u"1"),
-                (token.Token.Generic, u":"),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"["),
-                (token.Token.Literal.Number, u"8"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"0"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"14"),
-                (token.Token.Punctuation, u"]"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Literal.Number, u"2"),
-                (token.Token.Generic, u":"),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"["),
-                (token.Token.Literal.Number, u"-8"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"0"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"14"),
-                (token.Token.Punctuation, u"]"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u"\n"),
-                (token.Token.Punctuation, u"}"),
-                (token.Token.Text, u"\n"),
+                (Keyword.Token, u"custom"),
+                (Text.Whitespace, u" "),
+                (Keyword.Type, u"int[]"),
+                (Text.Whitespace, u" "),
+                (Name.Attribute, u"foo"),
+                (Text.Whitespace, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Punctuation, u"["),
+                (Literal.Number, u"8"),
+                (Generic, u","),
+                (Text, u" "),
+                (Literal.Number, u"10"),
+                (Generic, u","),
+                (Text, u" "),
+                (Literal.Number, u"14"),
+                (Punctuation, u"]"),
+                (Text, u"\n"),
+                (Keyword.Token, u"custom"),
+                (Text.Whitespace, u" "),
+                (Keyword.Type, u"int[]"),
+                (Text.Whitespace, u" "),
+                (Name.Attribute, u"foo"),
+                (Generic, u"."),
+                (Name.Keyword.Tokens, u"timeSamples"),
+                (Text.Whitespace, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Punctuation, u"{"),
+                (Text, u"\n    "),
+                (Literal.Number, u"1"),
+                (Generic, u":"),
+                (Text, u" "),
+                (Punctuation, u"["),
+                (Literal.Number, u"8"),
+                (Generic, u","),
+                (Text, u" "),
+                (Literal.Number, u"0"),
+                (Generic, u","),
+                (Text, u" "),
+                (Literal.Number, u"14"),
+                (Punctuation, u"]"),
+                (Generic, u","),
+                (Text, u"\n    "),
+                (Literal.Number, u"2"),
+                (Generic, u":"),
+                (Text, u" "),
+                (Punctuation, u"["),
+                (Literal.Number, u"-8"),
+                (Generic, u","),
+                (Text, u" "),
+                (Literal.Number, u"0"),
+                (Generic, u","),
+                (Text, u" "),
+                (Literal.Number, u"14"),
+                (Punctuation, u"]"),
+                (Generic, u","),
+                (Text, u"\n"),
+                (Punctuation, u"}"),
+                (Text, u"\n"),
             ],
             self._get(timesamples),
         )
@@ -291,8 +292,8 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Literal.String, u'"""\ncustom int[] foo = [8, 10, 14]\n"""'),
-                (token.Token.Text, u'\n'),
+                (Literal.String, u'"""\ncustom int[] foo = [8, 10, 14]\n"""'),
+                (Text, u"\n"),
             ],
             self._get(code),
         )
@@ -303,15 +304,15 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Literal.Number, u"8"),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"8.0123312132"),
-                (token.Token.Generic, u","),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"-4"),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.Number, u"-14.123"),
-                (token.Token.Text, u"\n"),
+                (Literal.Number, u"8"),
+                (Text, u" "),
+                (Literal.Number, u"8.0123312132"),
+                (Generic, u","),
+                (Text, u" "),
+                (Literal.Number, u"-4"),
+                (Text, u" "),
+                (Literal.Number, u"-14.123"),
+                (Text, u"\n"),
             ],
             self._get(code),
         )
@@ -340,86 +341,86 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Tokens, u"def"),
-                (token.Token.Text, u" "),
-                (token.Token.Generic, u"Xform"),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.String, u'"BottleMedical"'),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"("),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Name.Builtins, u"kind"),
-                (token.Token.Text, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.String, u'"prop"'),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Keyword.Tokens, u"payload"),
-                (token.Token.Text, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.String.Interpol, u"@./BottleMedical_payload.usd@"),
-                (token.Token.Name.Namespace, u"</BottleMedical>"),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Keyword.Tokens, u"variants"),
-                (token.Token.Text, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"{"),
-                (token.Token.Text, u"\n        "),
-                (token.Token.Keyword.Type, u"string"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Name.Attribute, u"modelingVariant"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.String, u'"LiquidBottleLg"'),
-                (token.Token.Text, u"\n        "),
-                (token.Token.Keyword.Type, u"string"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Name.Attribute, u"shadingComplexity"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.String, u'"full"'),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Punctuation, u"}"),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Keyword.Type, u"add"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Name.Attribute, u"variantSets"),
-                (token.Token.Text.Whitespace, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"["),
-                (token.Token.Literal.String, u'"modelingVariant"'),
-                (token.Token.Generic, u','),
-                (token.Token.Text, u' '),
-                (token.Token.Literal.String, u'"shadingComplexity"'),
-                (token.Token.Punctuation, u"]"),
-                (token.Token.Text, u"\n"),
-                (token.Token.Punctuation, u")"),
-                (token.Token.Text, u"\n"),
-                (token.Token.Punctuation, u"{"),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Keyword.Tokens, u"variantSet"),
-                (token.Token.Text, u" "),
-                (token.Token.Literal.String, u'"modelingVariant"'),
-                (token.Token.Text, u" "),
-                (token.Token.Operator, u"="),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"{"),
-                (token.Token.Text, u"\n        "),
-                (token.Token.Literal.String, u'"ALL_VARIANTS"'),
-                (token.Token.Text, u" "),
-                (token.Token.Punctuation, u"{"),
-                (token.Token.Text, u"\n        "),
-                (token.Token.Punctuation, u"}"),
-                (token.Token.Text, u"\n    "),
-                (token.Token.Punctuation, u"}"),
-                (token.Token.Text, u"\n"),
-                (token.Token.Punctuation, u"}"),
-                (token.Token.Text, u"\n"),
+                (Keyword.Tokens, u"def"),
+                (Text, u" "),
+                (Generic, u"Xform"),
+                (Text, u" "),
+                (Literal.String, u'"BottleMedical"'),
+                (Text, u" "),
+                (Punctuation, u"("),
+                (Text, u"\n    "),
+                (Name.Builtins, u"kind"),
+                (Text, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Literal.String, u'"prop"'),
+                (Text, u"\n    "),
+                (Keyword.Tokens, u"payload"),
+                (Text, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Literal.String.Interpol, u"@./BottleMedical_payload.usd@"),
+                (Name.Namespace, u"</BottleMedical>"),
+                (Text, u"\n    "),
+                (Keyword.Tokens, u"variants"),
+                (Text, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Punctuation, u"{"),
+                (Text, u"\n        "),
+                (Keyword.Type, u"string"),
+                (Text.Whitespace, u" "),
+                (Name.Attribute, u"modelingVariant"),
+                (Text.Whitespace, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Literal.String, u'"LiquidBottleLg"'),
+                (Text, u"\n        "),
+                (Keyword.Type, u"string"),
+                (Text.Whitespace, u" "),
+                (Name.Attribute, u"shadingComplexity"),
+                (Text.Whitespace, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Literal.String, u'"full"'),
+                (Text, u"\n    "),
+                (Punctuation, u"}"),
+                (Text, u"\n    "),
+                (Keyword.Type, u"add"),
+                (Text.Whitespace, u" "),
+                (Name.Attribute, u"variantSets"),
+                (Text.Whitespace, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Punctuation, u"["),
+                (Literal.String, u'"modelingVariant"'),
+                (Generic, u","),
+                (Text, u" "),
+                (Literal.String, u'"shadingComplexity"'),
+                (Punctuation, u"]"),
+                (Text, u"\n"),
+                (Punctuation, u")"),
+                (Text, u"\n"),
+                (Punctuation, u"{"),
+                (Text, u"\n    "),
+                (Keyword.Tokens, u"variantSet"),
+                (Text, u" "),
+                (Literal.String, u'"modelingVariant"'),
+                (Text, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Punctuation, u"{"),
+                (Text, u"\n        "),
+                (Literal.String, u'"ALL_VARIANTS"'),
+                (Text, u" "),
+                (Punctuation, u"{"),
+                (Text, u"\n        "),
+                (Punctuation, u"}"),
+                (Text, u"\n    "),
+                (Punctuation, u"}"),
+                (Text, u"\n"),
+                (Punctuation, u"}"),
+                (Text, u"\n"),
             ],
             self._get(code),
         )
@@ -429,11 +430,7 @@ class Features(_Common):
         code = '"Some \'text"'
 
         self.assertEqual(
-            [
-                (token.Token.Literal.String, code),
-                (token.Token.Text, u'\n')
-            ],
-            self._get(code),
+            [(Literal.String, code), (Text, u"\n")], self._get(code),
         )
 
     def test_string_multiple_line(self):
@@ -446,11 +443,7 @@ class Features(_Common):
         )
 
         self.assertEqual(
-            [
-                (token.Token.Literal.String, code1),
-                (token.Text, '\n'),
-            ],
-            self._get(code1),
+            [(Literal.String, code1), (Text, "\n"),], self._get(code1),
         )
 
         code2 = textwrap.dedent(
@@ -460,11 +453,7 @@ class Features(_Common):
         )
 
         self.assertEqual(
-            [
-                (token.Token.Literal.String, code2),
-                (token.Text, '\n'),
-            ],
-            self._get(code2),
+            [(Literal.String, code2), (Text, "\n"),], self._get(code2),
         )
 
         code3 = textwrap.dedent(
@@ -474,11 +463,7 @@ class Features(_Common):
         )
 
         self.assertEqual(
-            [
-                (token.Token.Literal.String, code3),
-                (token.Text, '\n'),
-            ],
-            self._get(code3),
+            [(Literal.String, code3), (Text, "\n"),], self._get(code3),
         )
 
 
@@ -498,32 +483,32 @@ class EdgeCases(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Keyword.Type, u'float[]'),
-                (token.Token.Text.Whitespace, u' '),
-                (token.Token.Name.Attribute, u'primvars:skel:jointWeights'),
-                (token.Token.Text.Whitespace, u' '),
-                (token.Token.Operator, u'='),
-                (token.Token.Text, u' '),
-                (token.Token.Punctuation, u'['),
-                (token.Token.Literal.Number, u'1'),
-                (token.Token.Punctuation, u']'),
-                (token.Token.Text, u' '),
-                (token.Token.Punctuation, u'('),
-                (token.Token.Text, u'\n    '),
-                (token.Token.Name.Builtins, u'elementSize'),
-                (token.Token.Text, u' '),
-                (token.Token.Operator, u'='),
-                (token.Token.Text, u' '),
-                (token.Token.Literal.Number, u'1'),
-                (token.Token.Text, u'\n    '),
-                (token.Token.Name.Builtins, u'interpolation'),
-                (token.Token.Text, u' '),
-                (token.Token.Operator, u'='),
-                (token.Token.Text, u' '),
-                (token.Token.Literal.String, u'"constant"'),
-                (token.Token.Text, u'\n'),
-                (token.Token.Punctuation, u')'),
-                (token.Token.Text, u'\n'),
+                (Keyword.Type, u"float[]"),
+                (Text.Whitespace, u" "),
+                (Name.Attribute, u"primvars:skel:jointWeights"),
+                (Text.Whitespace, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Punctuation, u"["),
+                (Literal.Number, u"1"),
+                (Punctuation, u"]"),
+                (Text, u" "),
+                (Punctuation, u"("),
+                (Text, u"\n    "),
+                (Name.Builtins, u"elementSize"),
+                (Text, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Literal.Number, u"1"),
+                (Text, u"\n    "),
+                (Name.Builtins, u"interpolation"),
+                (Text, u" "),
+                (Operator, u"="),
+                (Text, u" "),
+                (Literal.String, u'"constant"'),
+                (Text, u"\n"),
+                (Punctuation, u")"),
+                (Text, u"\n"),
             ],
             self._get(code),
         )
@@ -534,46 +519,46 @@ class EdgeCases(_Common):
 
         self.assertEqual(
             [
-                (token.Token.Literal.String.Interpol, u'@firststring@'),
-                (token.Token.Text, u' '),
-                (token.Token.Generic, u'something'),
-                (token.Token.Text, u' '),
-                (token.Token.Generic, u'else'),
-                (token.Token.Text, u' '),
-                (token.Token.Literal.String.Interpol, u'@secondstring@'),
-                (token.Token.Text, u'\n'),
+                (Literal.String.Interpol, u"@firststring@"),
+                (Text, u" "),
+                (Generic, u"something"),
+                (Text, u" "),
+                (Generic, u"else"),
+                (Text, u" "),
+                (Literal.String.Interpol, u"@secondstring@"),
+                (Text, u"\n"),
             ],
-            self._get(at_sign)
+            self._get(at_sign),
         )
 
         single = "'firststring' something else 'secondstring'"
 
         self.assertEqual(
             [
-                (token.Token.Literal.String, u"'firststring'"),
-                (token.Token.Text, u' '),
-                (token.Token.Generic, u'something'),
-                (token.Token.Text, u' '),
-                (token.Token.Generic, u'else'),
-                (token.Token.Text, u' '),
-                (token.Token.Literal.String, u"'secondstring'"),
-                (token.Token.Text, u'\n'),
+                (Literal.String, u"'firststring'"),
+                (Text, u" "),
+                (Generic, u"something"),
+                (Text, u" "),
+                (Generic, u"else"),
+                (Text, u" "),
+                (Literal.String, u"'secondstring'"),
+                (Text, u"\n"),
             ],
-            self._get(single)
+            self._get(single),
         )
 
         double = "'firststring' something else 'secondstring'"
 
         self.assertEqual(
             [
-                (token.Token.Literal.String, u"'firststring'"),
-                (token.Token.Text, u' '),
-                (token.Token.Generic, u'something'),
-                (token.Token.Text, u' '),
-                (token.Token.Generic, u'else'),
-                (token.Token.Text, u' '),
-                (token.Token.Literal.String, u"'secondstring'"),
-                (token.Token.Text, u'\n'),
+                (Literal.String, u"'firststring'"),
+                (Text, u" "),
+                (Generic, u"something"),
+                (Text, u" "),
+                (Generic, u"else"),
+                (Text, u" "),
+                (Literal.String, u"'secondstring'"),
+                (Text, u"\n"),
             ],
-            self._get(double)
+            self._get(double),
         )