more lazy import of schemes

src/sage/all.py

@@ -257,7 +257,7 @@ def quit_sage(verbose=True):
 register_unpickle_override('sage.categories.category_types', 'Rings', Rings)
 register_unpickle_override('sage.categories.category_types', 'Fields', Fields)
 register_unpickle_override('sage.categories.category_types', 'VectorSpaces', VectorSpaces)
-register_unpickle_override('sage.categories.category_types', 'Schemes_over_base', sage.categories.schemes.Schemes_over_base)
+# register_unpickle_override('sage.categories.category_types', 'Schemes_over_base', sage.categories.schemes.Schemes_over_base)
 register_unpickle_override('sage.categories.category_types', 'ModularAbelianVarieties', ModularAbelianVarieties)
 register_unpickle_override('sage.libs.pari.gen_py', 'pari', pari)
 

src/sage/categories/all.py

@@ -89,7 +89,7 @@
 
 # schemes and varieties
 from .modular_abelian_varieties import ModularAbelianVarieties
-from .schemes import Schemes
+lazy_import('sage.categories.schemes', 'Schemes')
 
 # * with basis
 from .modules_with_basis import ModulesWithBasis

src/sage/schemes/generic/__init__.py

@@ -1,2 +0,0 @@
-from __future__ import absolute_import
-from . import all

src/sage/schemes/generic/all.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 # code exports
+from sage.misc.lazy_import import lazy_import
 
-from .spec             import Spec
-from .hypersurface     import ProjectiveHypersurface, AffineHypersurface
+lazy_import('sage.schemes.generic.spec', 'Spec')
+lazy_import('sage.schemes.generic.hypersurface',
+            ['ProjectiveHypersurface', 'AffineHypersurface'])

src/sage/schemes/hyperelliptic_curves/__init__.py

@@ -1,2 +0,0 @@
-from __future__ import absolute_import
-from . import all

src/sage/schemes/toric/all.py

@@ -1,11 +1,11 @@
 from __future__ import absolute_import
 # code exports
 
-from .fano_variety import CPRFanoToricVariety
-from .ideal import ToricIdeal
-from .library import toric_varieties
-from .variety import AffineToricVariety, ToricVariety
-
-
 from sage.misc.lazy_import import lazy_import
+
+from .fano_variety import CPRFanoToricVariety
+lazy_import('sage.schemes.ideal','ToricIdeal')
+lazy_import('sage.schemes.library', 'toric_varieties')
+lazy_import('sage.schemes.toric.variety',
+            ['AffineToricVariety', 'ToricVariety'])
 lazy_import('sage.schemes.toric.weierstrass', 'WeierstrassForm')