diff options
author | Michel Selten <michel@mselten.demon.nl> | 2003-01-06 20:27:43 +0300 |
---|---|---|
committer | Michel Selten <michel@mselten.demon.nl> | 2003-01-06 20:27:43 +0300 |
commit | c95d631b8389869503fff05d6799e7ce7cc68324 (patch) | |
tree | cc00376792a6ffe4e5144404f4f201712b186646 | |
parent | fa45a0229510d2f9ffebd0d9061e899383368017 (diff) |
Removed references to modules that do not exist. The python interface is
broken, but it should give 0 errors when building.
Michel
27 files changed, 46 insertions, 41 deletions
diff --git a/intern/python/freeze/modulefinder.py b/intern/python/freeze/modulefinder.py index e84a54128f6..c80962fd815 100644 --- a/intern/python/freeze/modulefinder.py +++ b/intern/python/freeze/modulefinder.py @@ -330,9 +330,9 @@ class ModuleFinder: return m def find_module(self, name, path): - if name in self.excludes: - self.msgout(3, "find_module -> Excluded") - raise ImportError, name +# if name in self.excludes: +# self.msgout(3, "find_module -> Excluded") +# raise ImportError, name if path is None: if name in sys.builtin_module_names: diff --git a/intern/python/modules/Blender/BGL.py b/intern/python/modules/Blender/BGL.py index 033b3560e4f..3331ab3872f 100644 --- a/intern/python/modules/Blender/BGL.py +++ b/intern/python/modules/Blender/BGL.py @@ -1 +1 @@ -from _Blender.BGL import * +#from _Blender.BGL import * diff --git a/intern/python/modules/Blender/Camera.py b/intern/python/modules/Blender/Camera.py index 33f615fc0da..16a93d35e14 100644 --- a/intern/python/modules/Blender/Camera.py +++ b/intern/python/modules/Blender/Camera.py @@ -15,7 +15,7 @@ Example:: """ import shadow -import _Blender.Camera as _Camera +#import _Blender.Camera as _Camera class Camera(shadow.hasIPO): diff --git a/intern/python/modules/Blender/Draw.py b/intern/python/modules/Blender/Draw.py index 6c2cb8be09f..5b6a603d14a 100644 --- a/intern/python/modules/Blender/Draw.py +++ b/intern/python/modules/Blender/Draw.py @@ -1 +1 @@ -from _Blender.Draw import * +#from _Blender.Draw import * diff --git a/intern/python/modules/Blender/Image.py b/intern/python/modules/Blender/Image.py index c1737e1bb0d..305e497af99 100644 --- a/intern/python/modules/Blender/Image.py +++ b/intern/python/modules/Blender/Image.py @@ -8,7 +8,7 @@ im = Image.Load('dead-parrot.jpg') """ -import _Blender.Image as _Image +#import _Blender.Image as _Image import shadow class Image(shadow.shadow): diff --git a/intern/python/modules/Blender/Ipo.py b/intern/python/modules/Blender/Ipo.py index 110f95a5d07..795c10cbdcf 100644 --- a/intern/python/modules/Blender/Ipo.py +++ b/intern/python/modules/Blender/Ipo.py @@ -31,7 +31,7 @@ Example:: ob.setIpo(ipo) # assign ipo to object """ -import _Blender.Ipo as _Ipo +#import _Blender.Ipo as _Ipo import shadow diff --git a/intern/python/modules/Blender/Lamp.py b/intern/python/modules/Blender/Lamp.py index ab7ed63592a..4e1e0b3c395 100644 --- a/intern/python/modules/Blender/Lamp.py +++ b/intern/python/modules/Blender/Lamp.py @@ -11,7 +11,7 @@ Example:: ob.link(l) """ -import _Blender.Lamp as _Lamp +#import _Blender.Lamp as _Lamp import shadow _validBufferSizes = [512, 768, 1024, 1536, 2560] diff --git a/intern/python/modules/Blender/Material.py b/intern/python/modules/Blender/Material.py index f24541f0f03..134243f00b4 100644 --- a/intern/python/modules/Blender/Material.py +++ b/intern/python/modules/Blender/Material.py @@ -14,7 +14,7 @@ Scene.getCurrent().link(ob) # link object to current scene """ -import _Blender.Material as _Material +#import _Blender.Material as _Material import shadow #import Blender.Curve as Curve diff --git a/intern/python/modules/Blender/Mesh.py b/intern/python/modules/Blender/Mesh.py index dd8103919f8..fb2e496b254 100644 --- a/intern/python/modules/Blender/Mesh.py +++ b/intern/python/modules/Blender/Mesh.py @@ -51,7 +51,7 @@ from Blender.Types import NMFaceType import Blender.Material as Material -from _Blender import NMesh as _NMesh +#from _Blender import NMesh as _NMesh FACEFLAGS = _NMesh.Const DEFAULTFLAGS = FACEFLAGS.LIGHT + FACEFLAGS.DYNAMIC @@ -66,7 +66,7 @@ def makeFace(f): return face def toTriangles(ngon): - from utils import tesselation + #from utils import tesselation # This should be a Publisher only feature...once the tesselation # is improved. The GLU tesselator of Mesa < 4.0 is crappy... if len(ngon.uv) == len(ngon.v): diff --git a/intern/python/modules/Blender/NMesh.py b/intern/python/modules/Blender/NMesh.py index 3e6c60bab21..44c49eb263f 100644 --- a/intern/python/modules/Blender/NMesh.py +++ b/intern/python/modules/Blender/NMesh.py @@ -6,7 +6,7 @@ most probably limited. Use the 'Mesh' module instead. """ -import _Blender.NMesh as _NMesh +#import _Blender.NMesh as _NMesh import shadow class Mesh(shadow.shadow): diff --git a/intern/python/modules/Blender/Object.py b/intern/python/modules/Blender/Object.py index 7fefedf4725..d7b0a3e91b4 100644 --- a/intern/python/modules/Blender/Object.py +++ b/intern/python/modules/Blender/Object.py @@ -17,7 +17,7 @@ ob.makeParent([actobj]) # make ob the parent of actobj """ -import _Blender.Object as _Object +#import _Blender.Object as _Object import shadow reload(shadow) # XXX @@ -98,7 +98,7 @@ class Object(shadow.hasIPO): the Object's type, so you cannot link a Lamp to a mesh type Object. 'data' can also be an Ipo object (IpoBlock) """ - from _Blender import Types + #from _Blender import Types # special case for NMesh: if type(data) == Types.NMeshType: return self._object.link(data) @@ -146,7 +146,7 @@ original. The returned object is *free*, meaning, not linked to any scene.""" def getDeformData(self): """Returns the Datablock object containing the object's deformed data. Currently, this is only supported for a Mesh""" - import _Blender.NMesh as _NMesh + #import _Blender.NMesh as _NMesh t = self._object.getType() if t == self.Types['Mesh']: data = _NMesh.GetRawFromObject(self.name) diff --git a/intern/python/modules/Blender/Scene.py b/intern/python/modules/Blender/Scene.py index a6deaeb5a46..164f4df9617 100644 --- a/intern/python/modules/Blender/Scene.py +++ b/intern/python/modules/Blender/Scene.py @@ -14,7 +14,7 @@ newscene.link(cam) newscene.makeCurrent() # make current Scene """ -import _Blender.Scene as _Scene +#import _Blender.Scene as _Scene from Object import Object import shadow diff --git a/intern/python/modules/Blender/Text.py b/intern/python/modules/Blender/Text.py index 0d5f615f190..27701b28ac3 100644 --- a/intern/python/modules/Blender/Text.py +++ b/intern/python/modules/Blender/Text.py @@ -11,7 +11,7 @@ Text.unlink(text) # delete """ -import _Blender.Text as _Text +#import _Blender.Text as _Text class Text: """Wrapper for Text DataBlock""" diff --git a/intern/python/modules/Blender/Types.py b/intern/python/modules/Blender/Types.py index d49d9c35407..53887212ae0 100644 --- a/intern/python/modules/Blender/Types.py +++ b/intern/python/modules/Blender/Types.py @@ -1 +1 @@ -from _Blender.Types import * +#from _Blender.Types import * diff --git a/intern/python/modules/Blender/Window.py b/intern/python/modules/Blender/Window.py index e51ab894dfa..927727fe1ca 100644 --- a/intern/python/modules/Blender/Window.py +++ b/intern/python/modules/Blender/Window.py @@ -4,7 +4,7 @@ This module currently only supports redrawing commands of windows. Later on, it will allow screen manipulations and access to Window properties""" -import _Blender.Window as _Window +#import _Blender.Window as _Window t = _Window.Types Const = t # emulation diff --git a/intern/python/modules/Blender/World.py b/intern/python/modules/Blender/World.py index e0c42d33f16..c74fd0ce06e 100644 --- a/intern/python/modules/Blender/World.py +++ b/intern/python/modules/Blender/World.py @@ -1,4 +1,4 @@ -import _Blender.World as _World +#import _Blender.World as _World import shadow diff --git a/intern/python/modules/Blender/__init__.py b/intern/python/modules/Blender/__init__.py index 6c29a6bd115..240c0575061 100644 --- a/intern/python/modules/Blender/__init__.py +++ b/intern/python/modules/Blender/__init__.py @@ -6,7 +6,7 @@ __all__ = ["Object", "Image", "NMesh", "Window", "Mesh", "sys", "Lamp", "Scene", "Draw", "Camera", "Material", "Types", "Ipo", "BGL"] -import _Blender +#import _Blender Get = _Blender.Get Redraw = _Blender.Redraw diff --git a/intern/python/modules/Blender/sys.py b/intern/python/modules/Blender/sys.py index f76c0074c1f..8ffbe64e179 100644 --- a/intern/python/modules/Blender/sys.py +++ b/intern/python/modules/Blender/sys.py @@ -1,4 +1,4 @@ -from _Blender.sys import * +#from _Blender.sys import * sep = dirsep # path separator ('/' or '\') diff --git a/intern/python/modules/Converter/importer/VRMLimporter.py b/intern/python/modules/Converter/importer/VRMLimporter.py index e2bcea6a51e..121130e54cb 100644 --- a/intern/python/modules/Converter/importer/VRMLimporter.py +++ b/intern/python/modules/Converter/importer/VRMLimporter.py @@ -956,7 +956,7 @@ def importfile(name): global options global DEFAULTFLAGS - from Blender import Get # XXX +# from Blender import Get # XXX options = Get('vrmloptions') DEFAULTFLAGS = FACEFLAGS.LIGHT + FACEFLAGS.DYNAMIC if options['twoside']: diff --git a/intern/python/modules/TextTools/TextTools.py b/intern/python/modules/TextTools/TextTools.py index 7eae2bcfc39..123fc6cece7 100644 --- a/intern/python/modules/TextTools/TextTools.py +++ b/intern/python/modules/TextTools/TextTools.py @@ -10,7 +10,7 @@ import string,types # import the C module and the version number # from mxTextTools import * -from mxTextTools import __version__ +#from mxTextTools import __version__ # # import the symbols needed to write tag tables diff --git a/intern/python/modules/TextTools/mxTextTools/__init__.py b/intern/python/modules/TextTools/mxTextTools/__init__.py index 009b7cbd4c7..1222792cbae 100644 --- a/intern/python/modules/TextTools/mxTextTools/__init__.py +++ b/intern/python/modules/TextTools/mxTextTools/__init__.py @@ -4,8 +4,8 @@ See the documentation for further information on copyrights, or contact the author (mal@lemburg.com). """ -from mxTextTools import * -from mxTextTools import __version__ +#from mxTextTools import * +#from mxTextTools import __version__ # # Make BMS take the role of FS in case the Fast Search object was not built diff --git a/intern/python/modules/beta/Objects.py b/intern/python/modules/beta/Objects.py index 0ae56870fd6..53b50e46857 100644 --- a/intern/python/modules/beta/Objects.py +++ b/intern/python/modules/beta/Objects.py @@ -67,12 +67,13 @@ class shadowNMesh: self.flags = flags self.smooth = 0 self.faces = [] - try: - import tess - self.tess = tess.Tess(256, beginPolygon, endPolygon, error, addVertex) - except: - #print "couldn't import tesselator" - self.tess = None + # #try: + # import tess + # self.tess = tess.Tess(256, beginPolygon, endPolygon, error, addVertex) + # except: + # #print "couldn't import tesselator" + # self.tess = None + self.tess = None self.curface = None self.tessfaces = [] self.recalc_normals = 1 @@ -93,7 +94,7 @@ class shadowNMesh: # is improved. The GLU tesselator of Mesa < 4.0 is crappy... if not self.tess: return [] # no faces converted - import tess + # import tess i = 0 global tessfaces tessfaces = [] diff --git a/intern/python/modules/mcf/utils/hierobj.py b/intern/python/modules/mcf/utils/hierobj.py index 7730b4d3ba4..f7a2aa5b8dd 100644 --- a/intern/python/modules/mcf/utils/hierobj.py +++ b/intern/python/modules/mcf/utils/hierobj.py @@ -10,7 +10,8 @@ flattened copy of the hierarchy) 97-03-17 Added ability to pass arguments to hier_rapply and hier_rreturn. 97-10-31 Removed dependencies on mcf.store ''' -import copy,types +#import copy,types +import types import singletonlist, hier_rx class Hierobj: diff --git a/intern/python/modules/vrml/scenegraph.py b/intern/python/modules/vrml/scenegraph.py index 2f137b1e259..67c53dc3374 100644 --- a/intern/python/modules/vrml/scenegraph.py +++ b/intern/python/modules/vrml/scenegraph.py @@ -2,7 +2,8 @@ # Wed Oct 31 16:18:35 CET 2001 '''Prototype2 -- VRML 97 sceneGraph/Node/Script/ROUTE/IS implementations''' -import copy, types # extern +#import copy, types # extern +import types # extern import strop as string # builtin from utils import typeclasses, err, namespace # XXX ## TODO: namespace must go @@ -15,7 +16,7 @@ class baseProto: passed arguments for the linearisation object see lineariser4.Lineariser ''' - import lineariser4 +# import lineariser4 lineariser = apply( lineariser4.Lineariser, (), namedargs ) return apply( lineariser.linear, ( self, ), namedargs ) diff --git a/intern/python/modules/vrml/utils/collapse.py b/intern/python/modules/vrml/utils/collapse.py index 25da50c2adb..a612f7f4311 100644 --- a/intern/python/modules/vrml/utils/collapse.py +++ b/intern/python/modules/vrml/utils/collapse.py @@ -11,7 +11,8 @@ Destructive Functions for "collapsing" Sequences into single levels [1, 2, 3, 4, 5, 6] # note is the same root list ''' -import copy, types, sys +#import copy, types, sys +import types, sys from types import ListType, TupleType # this now only supports the obsolete stuff... def hyperCollapse( inlist, allowedmap, type=type, list=list, itype=types.InstanceType, maxint= sys.maxint): diff --git a/intern/python/modules/vrml/utils/namespace.py b/intern/python/modules/vrml/utils/namespace.py index dd9f0b7dea6..3cdb6c6147e 100644 --- a/intern/python/modules/vrml/utils/namespace.py +++ b/intern/python/modules/vrml/utils/namespace.py @@ -64,7 +64,8 @@ will likely want to do: from mcf.utils import extpkl, copy_extend 98.03.15 -- Fixed bug in items, values, etceteras with module-type base objects. ''' -import copy, types, string +#import copy, types, string +import types, string from mcf.utils import hierobj diff --git a/intern/python/modules/vrml/utils/typeclasses.py b/intern/python/modules/vrml/utils/typeclasses.py index ed798dfe3da..df2fdd1a985 100644 --- a/intern/python/modules/vrml/utils/typeclasses.py +++ b/intern/python/modules/vrml/utils/typeclasses.py @@ -36,7 +36,7 @@ def regnumpy(): if globals().has_key('Numeric'): return 1 try: - import Numeric +# import Numeric SequenceTypes.append( Numeric.ArrayType ) MutableTypes.append( Numeric.ArrayType ) MutableSequenceTypes.append( Numeric.ArrayType ) @@ -47,4 +47,4 @@ def regnumpy(): # for now, I'm going to always register these, if the module becomes part of the base distribution # it might be better to leave it out so numpy isn't always getting loaded... regarray() -regnumpy()
\ No newline at end of file +regnumpy() |