Merge pull request #2532 from xonsh/moveback

this never should have been moved

news/moveback.rst

@@ -0,0 +1,15 @@
+**Added:** None
+
+**Changed:**
+
+* Moved the lazy ``pkg_resources`` package back to its original
+  place. The will hopefully address some of the slowdown issues
+  experiances on some platforms.
+
+**Deprecated:** None
+
+**Removed:** None
+
+**Fixed:** None
+
+**Security:** None

xonsh/pyghooks.py

@@ -8,8 +8,13 @@ import builtins
 from collections import ChainMap
 from collections.abc import MutableMapping
 
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#           DO NOT MOVE
 # must come before pygments imports
 from xonsh.lazyasd import load_module_in_background
+load_module_in_background('pkg_resources', debug='XONSH_DEBUG',
+                          replacements={'pygments.plugin': 'pkg_resources'})
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 from pygments.lexer import inherit, bygroups, include
 from pygments.lexers.agile import PythonLexer
@@ -30,9 +35,6 @@ from xonsh.style_tools import norm_name
 from xonsh.lazyimps import terminal256
 from xonsh.platform import os_environ
 
-load_module_in_background('pkg_resources', debug='XONSH_DEBUG',
-                          replacements={'pygments.plugin': 'pkg_resources'})
-
 
 def _command_is_valid(cmd):
     try: