Merge branch 'master' into bug/angular-htmlbug/angular-html

# Conflicts:
#	tests/test_shell.py

1 files changed, 213 insertions, 213 deletions

diff --git a/tests/test_usd.py b/tests/test_usd.py
index 954820b5..8edebeab 100644..100755
--- a/tests/test_usd.py
+++ b/tests/test_usd.py
@@ -217,66 +217,66 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (Keyword.Token, u"custom"),
-                (Whitespace, u" "),
-                (Keyword.Type, u"int[]"),
-                (Whitespace, u" "),
-                (Name.Attribute, u"foo"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (Punctuation, u"["),
-                (Number, u"8"),
-                (Punctuation, u","),
-                (Whitespace, u" "),
-                (Number, u"10"),
-                (Punctuation, u","),
-                (Whitespace, u" "),
-                (Number, u"14"),
-                (Punctuation, u"]"),
-                (Whitespace, u"\n"),
-                (Keyword.Token, u"custom"),
-                (Whitespace, u" "),
-                (Keyword.Type, u"int[]"),
-                (Whitespace, u" "),
-                (Name.Attribute, u"foo"),
-                (Text, u"."),
-                (Name.Keyword.Tokens, u"timeSamples"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (Punctuation, u"{"),
-                (Whitespace, u"\n    "),
-                (Number, u"1"),
-                (Punctuation, u":"),
-                (Whitespace, u" "),
-                (Punctuation, u"["),
-                (Number, u"8"),
-                (Punctuation, u","),
-                (Whitespace, u" "),
-                (Number, u"0"),
-                (Punctuation, u","),
-                (Whitespace, u" "),
-                (Number, u"14"),
-                (Punctuation, u"]"),
-                (Punctuation, u","),
-                (Whitespace, u"\n    "),
-                (Number, u"2"),
-                (Punctuation, u":"),
-                (Whitespace, u" "),
-                (Punctuation, u"["),
-                (Number, u"-8"),
-                (Punctuation, u","),
-                (Whitespace, u" "),
-                (Number, u"0"),
-                (Punctuation, u","),
-                (Whitespace, u" "),
-                (Number, u"14"),
-                (Punctuation, u"]"),
-                (Punctuation, u","),
-                (Whitespace, u"\n"),
-                (Punctuation, u"}"),
-                (Whitespace, u"\n"),
+                (Keyword.Token, "custom"),
+                (Whitespace, " "),
+                (Keyword.Type, "int[]"),
+                (Whitespace, " "),
+                (Name.Attribute, "foo"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (Punctuation, "["),
+                (Number, "8"),
+                (Punctuation, ","),
+                (Whitespace, " "),
+                (Number, "10"),
+                (Punctuation, ","),
+                (Whitespace, " "),
+                (Number, "14"),
+                (Punctuation, "]"),
+                (Whitespace, "\n"),
+                (Keyword.Token, "custom"),
+                (Whitespace, " "),
+                (Keyword.Type, "int[]"),
+                (Whitespace, " "),
+                (Name.Attribute, "foo"),
+                (Text, "."),
+                (Name.Keyword.Tokens, "timeSamples"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (Punctuation, "{"),
+                (Whitespace, "\n    "),
+                (Number, "1"),
+                (Punctuation, ":"),
+                (Whitespace, " "),
+                (Punctuation, "["),
+                (Number, "8"),
+                (Punctuation, ","),
+                (Whitespace, " "),
+                (Number, "0"),
+                (Punctuation, ","),
+                (Whitespace, " "),
+                (Number, "14"),
+                (Punctuation, "]"),
+                (Punctuation, ","),
+                (Whitespace, "\n    "),
+                (Number, "2"),
+                (Punctuation, ":"),
+                (Whitespace, " "),
+                (Punctuation, "["),
+                (Number, "-8"),
+                (Punctuation, ","),
+                (Whitespace, " "),
+                (Number, "0"),
+                (Punctuation, ","),
+                (Whitespace, " "),
+                (Number, "14"),
+                (Punctuation, "]"),
+                (Punctuation, ","),
+                (Whitespace, "\n"),
+                (Punctuation, "}"),
+                (Whitespace, "\n"),
             ],
             self._get(timesamples),
         )
@@ -292,8 +292,8 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (String, u'"""\ncustom int[] foo = [8, 10, 14]\n"""'),
-                (Whitespace, u"\n"),
+                (String, '"""\ncustom int[] foo = [8, 10, 14]\n"""'),
+                (Whitespace, "\n"),
             ],
             self._get(code),
         )
@@ -304,23 +304,23 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (Number, u"8"),
-                (Whitespace, u" "),
-                (Number, u"8.0123312132"),
-                (Punctuation, u","),
-                (Whitespace, u" "),
-                (Number, u"-4"),
-                (Whitespace, u" "),
-                (Number, u"-14.123"),
-                (Whitespace, u" "),
-                (Number, u"1e10"),
-                (Whitespace, u" "),
-                (Number, u"0.1e10"),
-                (Whitespace, u" "),
-                (Number, u"10.123e+10"),
-                (Whitespace, u" "),
-                (Number, u"0.123e-14"),
-                (Whitespace, u"\n"),
+                (Number, "8"),
+                (Whitespace, " "),
+                (Number, "8.0123312132"),
+                (Punctuation, ","),
+                (Whitespace, " "),
+                (Number, "-4"),
+                (Whitespace, " "),
+                (Number, "-14.123"),
+                (Whitespace, " "),
+                (Number, "1e10"),
+                (Whitespace, " "),
+                (Number, "0.1e10"),
+                (Whitespace, " "),
+                (Number, "10.123e+10"),
+                (Whitespace, " "),
+                (Number, "0.123e-14"),
+                (Whitespace, "\n"),
             ],
             self._get(code),
         )
@@ -349,86 +349,86 @@ class Features(_Common):
 
         self.assertEqual(
             [
-                (Keyword.Tokens, u"def"),
-                (Whitespace, u" "),
-                (Text, u"Xform"),
-                (Whitespace, u" "),
-                (String, u'"BottleMedical"'),
-                (Whitespace, u" "),
-                (Punctuation, u"("),
-                (Whitespace, u"\n    "),
-                (Name.Builtins, u"kind"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (String, u'"prop"'),
-                (Whitespace, u"\n    "),
-                (Keyword.Tokens, u"payload"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (String.Interpol, u"@./BottleMedical_payload.usd@"),
-                (Name.Namespace, u"</BottleMedical>"),
-                (Whitespace, u"\n    "),
-                (Keyword.Tokens, u"variants"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (Punctuation, u"{"),
-                (Whitespace, u"\n        "),
-                (Keyword.Type, u"string"),
-                (Whitespace, u" "),
-                (Name.Attribute, u"modelingVariant"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (String, u'"LiquidBottleLg"'),
-                (Whitespace, u"\n        "),
-                (Keyword.Type, u"string"),
-                (Whitespace, u" "),
-                (Name.Attribute, u"shadingComplexity"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (String, u'"full"'),
-                (Whitespace, u"\n    "),
-                (Punctuation, u"}"),
-                (Whitespace, u"\n    "),
-                (Keyword.Type, u"add"),
-                (Text.Whitespace, u" "),
-                (Name.Attribute, u"variantSets"),
-                (Text.Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (Punctuation, u"["),
-                (String, u'"modelingVariant"'),
-                (Punctuation, u","),
-                (Whitespace, u" "),
-                (String, u'"shadingComplexity"'),
-                (Punctuation, u"]"),
-                (Whitespace, u"\n"),
-                (Punctuation, u")"),
-                (Whitespace, u"\n"),
-                (Punctuation, u"{"),
-                (Whitespace, u"\n    "),
-                (Keyword.Tokens, u"variantSet"),
-                (Whitespace, u" "),
-                (String, u'"modelingVariant"'),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (Punctuation, u"{"),
-                (Whitespace, u"\n        "),
-                (String, u'"ALL_VARIANTS"'),
-                (Whitespace, u" "),
-                (Punctuation, u"{"),
-                (Whitespace, u"\n        "),
-                (Punctuation, u"}"),
-                (Whitespace, u"\n    "),
-                (Punctuation, u"}"),
-                (Whitespace, u"\n"),
-                (Punctuation, u"}"),
-                (Whitespace, u"\n"),
+                (Keyword.Tokens, "def"),
+                (Whitespace, " "),
+                (Text, "Xform"),
+                (Whitespace, " "),
+                (String, '"BottleMedical"'),
+                (Whitespace, " "),
+                (Punctuation, "("),
+                (Whitespace, "\n    "),
+                (Name.Builtins, "kind"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (String, '"prop"'),
+                (Whitespace, "\n    "),
+                (Keyword.Tokens, "payload"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (String.Interpol, "@./BottleMedical_payload.usd@"),
+                (Name.Namespace, "</BottleMedical>"),
+                (Whitespace, "\n    "),
+                (Keyword.Tokens, "variants"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (Punctuation, "{"),
+                (Whitespace, "\n        "),
+                (Keyword.Type, "string"),
+                (Whitespace, " "),
+                (Name.Attribute, "modelingVariant"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (String, '"LiquidBottleLg"'),
+                (Whitespace, "\n        "),
+                (Keyword.Type, "string"),
+                (Whitespace, " "),
+                (Name.Attribute, "shadingComplexity"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (String, '"full"'),
+                (Whitespace, "\n    "),
+                (Punctuation, "}"),
+                (Whitespace, "\n    "),
+                (Keyword.Type, "add"),
+                (Text.Whitespace, " "),
+                (Name.Attribute, "variantSets"),
+                (Text.Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (Punctuation, "["),
+                (String, '"modelingVariant"'),
+                (Punctuation, ","),
+                (Whitespace, " "),
+                (String, '"shadingComplexity"'),
+                (Punctuation, "]"),
+                (Whitespace, "\n"),
+                (Punctuation, ")"),
+                (Whitespace, "\n"),
+                (Punctuation, "{"),
+                (Whitespace, "\n    "),
+                (Keyword.Tokens, "variantSet"),
+                (Whitespace, " "),
+                (String, '"modelingVariant"'),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (Punctuation, "{"),
+                (Whitespace, "\n        "),
+                (String, '"ALL_VARIANTS"'),
+                (Whitespace, " "),
+                (Punctuation, "{"),
+                (Whitespace, "\n        "),
+                (Punctuation, "}"),
+                (Whitespace, "\n    "),
+                (Punctuation, "}"),
+                (Whitespace, "\n"),
+                (Punctuation, "}"),
+                (Whitespace, "\n"),
             ],
             self._get(code),
         )
@@ -438,13 +438,13 @@ class Features(_Common):
         code = '"Some \'text"'
 
         self.assertEqual(
-            [(String, code), (Whitespace, u"\n")], self._get(code),
+            [(String, code), (Whitespace, "\n")], self._get(code),
         )
 
     def test_string_multiple_line(self):
         """Check that different multi-line strings work correctly."""
         code1 = textwrap.dedent(
-            u'''\
+            '''\
             """
             Some text multiline
             """'''
@@ -455,7 +455,7 @@ class Features(_Common):
         )
 
         code2 = textwrap.dedent(
-            u'''\
+            '''\
             """Some text multiline
             """'''
         )
@@ -465,7 +465,7 @@ class Features(_Common):
         )
 
         code3 = textwrap.dedent(
-            u'''\
+            '''\
             """
             Some text multiline"""'''
         )
@@ -491,32 +491,32 @@ class EdgeCases(_Common):
 
         self.assertEqual(
             [
-                (Keyword.Type, u"float[]"),
-                (Whitespace, u" "),
-                (Name.Attribute, u"primvars:skel:jointWeights"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (Punctuation, u"["),
-                (Number, u"1"),
-                (Punctuation, u"]"),
-                (Whitespace, u" "),
-                (Punctuation, u"("),
-                (Whitespace, u"\n    "),
-                (Name.Builtins, u"elementSize"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (Number, u"1"),
-                (Whitespace, u"\n    "),
-                (Name.Builtins, u"interpolation"),
-                (Whitespace, u" "),
-                (Operator, u"="),
-                (Whitespace, u" "),
-                (String, u'"constant"'),
-                (Whitespace, u"\n"),
-                (Punctuation, u")"),
-                (Whitespace, u"\n"),
+                (Keyword.Type, "float[]"),
+                (Whitespace, " "),
+                (Name.Attribute, "primvars:skel:jointWeights"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (Punctuation, "["),
+                (Number, "1"),
+                (Punctuation, "]"),
+                (Whitespace, " "),
+                (Punctuation, "("),
+                (Whitespace, "\n    "),
+                (Name.Builtins, "elementSize"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (Number, "1"),
+                (Whitespace, "\n    "),
+                (Name.Builtins, "interpolation"),
+                (Whitespace, " "),
+                (Operator, "="),
+                (Whitespace, " "),
+                (String, '"constant"'),
+                (Whitespace, "\n"),
+                (Punctuation, ")"),
+                (Whitespace, "\n"),
             ],
             self._get(code),
         )
@@ -527,14 +527,14 @@ class EdgeCases(_Common):
 
         self.assertEqual(
             [
-                (String.Interpol, u"@firststring@"),
-                (Whitespace, u" "),
-                (Text, u"something"),
-                (Whitespace, u" "),
-                (Text, u"else"),
-                (Whitespace, u" "),
-                (String.Interpol, u"@secondstring@"),
-                (Whitespace, u"\n"),
+                (String.Interpol, "@firststring@"),
+                (Whitespace, " "),
+                (Text, "something"),
+                (Whitespace, " "),
+                (Text, "else"),
+                (Whitespace, " "),
+                (String.Interpol, "@secondstring@"),
+                (Whitespace, "\n"),
             ],
             self._get(at_sign),
         )
@@ -543,14 +543,14 @@ class EdgeCases(_Common):
 
         self.assertEqual(
             [
-                (String, u"'firststring'"),
-                (Whitespace, u" "),
-                (Text, u"something"),
-                (Whitespace, u" "),
-                (Text, u"else"),
-                (Whitespace, u" "),
-                (String, u"'secondstring'"),
-                (Whitespace, u"\n"),
+                (String, "'firststring'"),
+                (Whitespace, " "),
+                (Text, "something"),
+                (Whitespace, " "),
+                (Text, "else"),
+                (Whitespace, " "),
+                (String, "'secondstring'"),
+                (Whitespace, "\n"),
             ],
             self._get(single),
         )
@@ -559,14 +559,14 @@ class EdgeCases(_Common):
 
         self.assertEqual(
             [
-                (String, u"'firststring'"),
-                (Whitespace, u" "),
-                (Text, u"something"),
-                (Whitespace, u" "),
-                (Text, u"else"),
-                (Whitespace, u" "),
-                (String, u"'secondstring'"),
-                (Whitespace, u"\n"),
+                (String, "'firststring'"),
+                (Whitespace, " "),
+                (Text, "something"),
+                (Whitespace, " "),
+                (Text, "else"),
+                (Whitespace, " "),
+                (String, "'secondstring'"),
+                (Whitespace, "\n"),
             ],
             self._get(double),
         )