fix import order and use relative imports in fo/__nit__.py and nn/__init__.py

Author: lise-brinck

spacy/lang/fo/__init__.py

@@ -1,12 +1,6 @@
-import spacy
+from ...language import BaseDefaults, Language
+from ..punctuation import TOKENIZER_INFIXES, TOKENIZER_PREFIXES, TOKENIZER_SUFFIXES
 from .tokenizer_exceptions import TOKENIZER_EXCEPTIONS
-from spacy.lang.punctuation import (
-    TOKENIZER_SUFFIXES,
-    TOKENIZER_PREFIXES,
-    TOKENIZER_INFIXES,
-)
-
-from spacy.language import Language, BaseDefaults
 
 
 class FaroeseDefaults(BaseDefaults):
@@ -16,7 +10,6 @@ class FaroeseDefaults(BaseDefaults):
     prefixes = TOKENIZER_PREFIXES
 
 
-@spacy.registry.languages("fo")
 class Faroese(Language):
     lang = "fo"
     Defaults = FaroeseDefaults

spacy/lang/nn/__init__.py

@@ -1,7 +1,6 @@
-import spacy
-from spacy.language import BaseDefaults, Language
+from ...language import BaseDefaults, Language
+from ..nb import SYNTAX_ITERATORS
 from .punctuation import TOKENIZER_INFIXES, TOKENIZER_PREFIXES, TOKENIZER_SUFFIXES
-from spacy.lang.nb import SYNTAX_ITERATORS
 from .tokenizer_exceptions import TOKENIZER_EXCEPTIONS
 
 
@@ -13,7 +12,6 @@ class NorwegianNynorskDefaults(BaseDefaults):
     syntax_iterators = SYNTAX_ITERATORS
 
 
-@spacy.registry.languages("nn")
 class NorwegianNynorsk(Language):
     lang = "nn"
     Defaults = NorwegianNynorskDefaults