Revert to the FUTURE_PYTHON_API, this means:
- switching the define on in buildsystems (NaN, auto and msvc are done) - again import _Blender, which is the C module, from the Python modules
This commit is contained in:
@@ -2,8 +2,7 @@
|
||||
# Wed Oct 31 16:18:35 CET 2001
|
||||
|
||||
'''Prototype2 -- VRML 97 sceneGraph/Node/Script/ROUTE/IS implementations'''
|
||||
#import copy, types # extern
|
||||
import types # extern
|
||||
import copy, types # extern
|
||||
import strop as string # builtin
|
||||
from utils import typeclasses, err, namespace # XXX
|
||||
## TODO: namespace must go
|
||||
@@ -16,7 +15,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 )
|
||||
|
||||
|
@@ -11,8 +11,7 @@ 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 types, sys
|
||||
import copy, 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):
|
||||
|
@@ -64,8 +64,7 @@ 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 types, string
|
||||
import copy, types, string
|
||||
|
||||
from mcf.utils import hierobj
|
||||
|
||||
|
@@ -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 )
|
||||
|
Reference in New Issue
Block a user