From 7281c73ad295ea250c201f5ef29c70a7fc8b34c0 Mon Sep 17 00:00:00 2001
From: Lise Brinck <lise.brinck@vitecsoftware.com>
Date: Wed, 8 Nov 2023 10:44:25 +0100
Subject: [PATCH] fix import order and use relative imports in fo/__nit__.py
 and nn/__init__.py

---
 spacy/lang/fo/__init__.py | 11 ++---------
 spacy/lang/nn/__init__.py |  6 ++----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/spacy/lang/fo/__init__.py b/spacy/lang/fo/__init__.py
index f815bb185..db18f1a5d 100644
--- a/spacy/lang/fo/__init__.py
+++ b/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
diff --git a/spacy/lang/nn/__init__.py b/spacy/lang/nn/__init__.py
index eb1258b0d..ebbf07090 100644
--- a/spacy/lang/nn/__init__.py
+++ b/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