From 3c0f85de8e2fab03f98750e6b8c4b8702676cc5f Mon Sep 17 00:00:00 2001
From: ines <ines@ines.io>
Date: Mon, 8 May 2017 23:58:07 +0200
Subject: [PATCH] Remove imports in /lang/__init__.py

---
 spacy/lang/__init__.py                  | 4 ----
 spacy/tests/{de => lang}/__init__.py    | 0
 spacy/tests/{en => lang/bn}/__init__.py | 0
 spacy/tests/{es => lang/de}/__init__.py | 0
 spacy/tests/{fi => lang/en}/__init__.py | 0
 spacy/tests/{he => lang/es}/__init__.py | 0
 spacy/tests/{hu => lang/fi}/__init__.py | 0
 spacy/tests/{nb => lang/fr}/__init__.py | 0
 spacy/tests/{sv => lang/he}/__init__.py | 0
 spacy/tests/regression/test_issue768.py | 7 ++++---
 spacy/tests/regression/test_issue910.py | 2 +-
 11 files changed, 5 insertions(+), 8 deletions(-)
 rename spacy/tests/{de => lang}/__init__.py (100%)
 rename spacy/tests/{en => lang/bn}/__init__.py (100%)
 rename spacy/tests/{es => lang/de}/__init__.py (100%)
 rename spacy/tests/{fi => lang/en}/__init__.py (100%)
 rename spacy/tests/{he => lang/es}/__init__.py (100%)
 rename spacy/tests/{hu => lang/fi}/__init__.py (100%)
 rename spacy/tests/{nb => lang/fr}/__init__.py (100%)
 rename spacy/tests/{sv => lang/he}/__init__.py (100%)

diff --git a/spacy/lang/__init__.py b/spacy/lang/__init__.py
index ace90644c..e69de29bb 100644
--- a/spacy/lang/__init__.py
+++ b/spacy/lang/__init__.py
@@ -1,4 +0,0 @@
-from .punctuation import *
-from .tag_map import TAG_MAP
-from .entity_rules import ENTITY_RULES
-from .tokenizer_exceptions import BASE_EXCEPTIONS, TOKEN_MATCH
diff --git a/spacy/tests/de/__init__.py b/spacy/tests/lang/__init__.py
similarity index 100%
rename from spacy/tests/de/__init__.py
rename to spacy/tests/lang/__init__.py
diff --git a/spacy/tests/en/__init__.py b/spacy/tests/lang/bn/__init__.py
similarity index 100%
rename from spacy/tests/en/__init__.py
rename to spacy/tests/lang/bn/__init__.py
diff --git a/spacy/tests/es/__init__.py b/spacy/tests/lang/de/__init__.py
similarity index 100%
rename from spacy/tests/es/__init__.py
rename to spacy/tests/lang/de/__init__.py
diff --git a/spacy/tests/fi/__init__.py b/spacy/tests/lang/en/__init__.py
similarity index 100%
rename from spacy/tests/fi/__init__.py
rename to spacy/tests/lang/en/__init__.py
diff --git a/spacy/tests/he/__init__.py b/spacy/tests/lang/es/__init__.py
similarity index 100%
rename from spacy/tests/he/__init__.py
rename to spacy/tests/lang/es/__init__.py
diff --git a/spacy/tests/hu/__init__.py b/spacy/tests/lang/fi/__init__.py
similarity index 100%
rename from spacy/tests/hu/__init__.py
rename to spacy/tests/lang/fi/__init__.py
diff --git a/spacy/tests/nb/__init__.py b/spacy/tests/lang/fr/__init__.py
similarity index 100%
rename from spacy/tests/nb/__init__.py
rename to spacy/tests/lang/fr/__init__.py
diff --git a/spacy/tests/sv/__init__.py b/spacy/tests/lang/he/__init__.py
similarity index 100%
rename from spacy/tests/sv/__init__.py
rename to spacy/tests/lang/he/__init__.py
diff --git a/spacy/tests/regression/test_issue768.py b/spacy/tests/regression/test_issue768.py
index ff34decba..a5feb447d 100644
--- a/spacy/tests/regression/test_issue768.py
+++ b/spacy/tests/regression/test_issue768.py
@@ -3,9 +3,10 @@ from __future__ import unicode_literals
 
 from ...language import Language
 from ...attrs import LANG
-from ...fr.stop_words import STOP_WORDS
-from ...fr.tokenizer_exceptions import TOKENIZER_EXCEPTIONS
-from ...language_data.punctuation import TOKENIZER_INFIXES, ALPHA
+from ...lang.fr.stop_words import STOP_WORDS
+from ...lang.fr.tokenizer_exceptions import TOKENIZER_EXCEPTIONS
+from ...lang.punctuation import TOKENIZER_INFIXES
+from ...lang.char_classes import ALPHA
 from ...util import update_exc
 
 import pytest
diff --git a/spacy/tests/regression/test_issue910.py b/spacy/tests/regression/test_issue910.py
index 3790d429b..4505b500e 100644
--- a/spacy/tests/regression/test_issue910.py
+++ b/spacy/tests/regression/test_issue910.py
@@ -12,7 +12,7 @@ from pathlib import Path
 import pathlib
 from ...gold import GoldParse
 from ...pipeline import EntityRecognizer
-from ...en import English
+from ...lang.en import English
 
 try:
     unicode