[JIT] add support for torch.jit.Final in python 3.6

ghstack-source-id: 9928d3f32dffd4ea07d8493c3cd81e7e279533e0 Pull Request resolved: #47393
pytorch · Nov 5, 2020 · a7fa1ab · a7fa1ab
1 parent e4bc785
commit a7fa1ab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/test/jit/test_recursive_script.py b/test/jit/test_recursive_script.py
@@ -1,4 +1,3 @@
-import unittest
 import os
 import sys
 import typing
@@ -159,7 +158,6 @@ def a(x):
             # Make sure that no entries are left over from the previous failure
             FileCheck().check_count("is being compiled", 2).run(str(e))
 
-    @unittest.skipIf(sys.version_info[:2] < (3, 7), "Class annotations are a thing in > 3.5, need to fix for < 3.7")
     def test_constants_with_final(self):
         class M1(torch.nn.Module):
             x : torch.jit.Final[int]

diff --git a/torch/_jit_internal.py b/torch/_jit_internal.py
@@ -717,7 +717,7 @@ def is_rref(ann):
 
 def is_final(ann):
     return ann.__module__ in {'typing', 'typing_extensions'} and \
-        (getattr(ann, '__origin__', None) is Final)
+        (getattr(ann, '__origin__', None) is Final or isinstance(ann, type(Final)))
 
 # allows BroadcastingList instance to be subscriptable
 class BroadcastingListCls(object):