archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

renamed bpy.sys to bpy.utils, since it used to be a attempt to replace pythons sys which is bundled now

Browse Source
This commit is contained in:
Campbell Barton
2009-11-03 18:08:25 +00:00
parent e4f90d9379
commit 6680dcd24a
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
release/scripts/io/export_fbx.py
View File

@@ -237,14 +237,14 @@ def sane_groupname(data): return sane_name(data, sane_name_mapping_group)
# FORCE_CWD - dont use the basepath, just add a ./ to the filename. # FORCE_CWD - dont use the basepath, just add a ./ to the filename.
# use when we know the file will be in the basepath. # use when we know the file will be in the basepath.
# ''' # '''
# fname = bpy.sys.expandpath(fname_orig) # fname = bpy.utils.expandpath(fname_orig)
# # fname = Blender.sys.expandpath(fname_orig) # # fname = Blender.sys.expandpath(fname_orig)
# fname_strip = os.path.basename(fname) # fname_strip = os.path.basename(fname)
# # fname_strip = strip_path(fname) # # fname_strip = strip_path(fname)
# if FORCE_CWD: # if FORCE_CWD:
# fname_rel = '.' + os.sep + fname_strip # fname_rel = '.' + os.sep + fname_strip
# else: # else:
# fname_rel = bpy.sys.relpath(fname, basepath) # fname_rel = bpy.utils.relpath(fname, basepath)
# # fname_rel = Blender.sys.relpath(fname, basepath) # # fname_rel = Blender.sys.relpath(fname, basepath)
# if fname_rel.startswith('//'): fname_rel = '.' + os.sep + fname_rel[2:] # if fname_rel.startswith('//'): fname_rel = '.' + os.sep + fname_rel[2:]
# return fname, fname_strip, fname_rel # return fname, fname_strip, fname_rel
@@ -349,7 +349,7 @@ def write(filename, batch_objects = None, \
fbxpath = filename fbxpath = filename
# get the path component of filename # get the path component of filename
tmp_exists = bpy.sys.exists(fbxpath) tmp_exists = bpy.utils.exists(fbxpath)
# tmp_exists = Blender.sys.exists(fbxpath) # tmp_exists = Blender.sys.exists(fbxpath)
if tmp_exists != 2: # a file, we want a path if tmp_exists != 2: # a file, we want a path
@@ -363,7 +363,7 @@ def write(filename, batch_objects = None, \
# Draw.PupMenu('Error%t|Directory does not exist!') # Draw.PupMenu('Error%t|Directory does not exist!')
return return
tmp_exists = bpy.sys.exists(fbxpath) tmp_exists = bpy.utils.exists(fbxpath)
# tmp_exists = Blender.sys.exists(fbxpath) # tmp_exists = Blender.sys.exists(fbxpath)
if tmp_exists != 2: if tmp_exists != 2:
@@ -398,7 +398,7 @@ def write(filename, batch_objects = None, \
# path may alredy exist # path may alredy exist
# TODO - might exist but be a file. unlikely but should probably account for it. # TODO - might exist but be a file. unlikely but should probably account for it.
if bpy.sys.exists(new_fbxpath) == 0: if bpy.utils.exists(new_fbxpath) == 0:
# if Blender.sys.exists(new_fbxpath) == 0: # if Blender.sys.exists(new_fbxpath) == 0:
os.mkdir(new_fbxpath) os.mkdir(new_fbxpath)
@@ -3456,7 +3456,7 @@ bpy.ops.add(EXPORT_OT_fbx)
# - bpy.data.remove_scene: line 366 # - bpy.data.remove_scene: line 366
# - bpy.sys.time move to bpy.sys.util? # - bpy.sys.time move to bpy.sys.util?
# - new scene creation, activation: lines 327-342, 368 # - new scene creation, activation: lines 327-342, 368
# - uses bpy.sys.expandpath, *.relpath - replace at least relpath # - uses bpy.utils.expandpath, *.relpath - replace at least relpath
# SMALL or COSMETICAL # SMALL or COSMETICAL
# - find a way to get blender version, and put it in bpy.util?, old was Blender.Get('version') # - find a way to get blender version, and put it in bpy.util?, old was Blender.Get('version')

4
release/scripts/io/export_obj.py
View File

@@ -223,11 +223,11 @@ def copy_images(dest_dir):
copyCount = 0 copyCount = 0
# for bImage in uniqueImages.values(): # for bImage in uniqueImages.values():
# image_path = bpy.sys.expandpath(bImage.filename) # image_path = bpy.utils.expandpath(bImage.filename)
# if bpy.sys.exists(image_path): # if bpy.sys.exists(image_path):
# # Make a name for the target path. # # Make a name for the target path.
# dest_image_path = dest_dir + image_path.split('\\')[-1].split('/')[-1] # dest_image_path = dest_dir + image_path.split('\\')[-1].split('/')[-1]
# if not bpy.sys.exists(dest_image_path): # Image isnt alredy there # if not bpy.utils.exists(dest_image_path): # Image isnt alredy there
# print('\tCopying "%s" > "%s"' % (image_path, dest_image_path)) # print('\tCopying "%s" > "%s"' % (image_path, dest_image_path))
# copy_file(image_path, dest_image_path) # copy_file(image_path, dest_image_path)
# copyCount+=1 # copyCount+=1

8
release/scripts/io/netrender/client.py
View File

@@ -46,7 +46,7 @@ def addPointCache(job, ob, point_cache, default_path):
if name == "": if name == "":
name = "".join(["%02X" % ord(c) for c in ob.name]) name = "".join(["%02X" % ord(c) for c in ob.name])
cache_path = bpy.sys.expandpath(point_cache.filepath) if point_cache.external else default_path cache_path = bpy.utils.expandpath(point_cache.filepath) if point_cache.external else default_path
index = "%02i" % point_cache.index index = "%02i" % point_cache.index
@@ -111,14 +111,14 @@ def clientSendJob(conn, scene, anim = False):
# LIBRARIES # LIBRARIES
########################### ###########################
for lib in bpy.data.libraries: for lib in bpy.data.libraries:
job.addFile(bpy.sys.expandpath(lib_path)) job.addFile(bpy.utils.expandpath(lib_path))
########################### ###########################
# IMAGES # IMAGES
########################### ###########################
for image in bpy.data.images: for image in bpy.data.images:
if image.source == "FILE" and not image.packed_file: if image.source == "FILE" and not image.packed_file:
job.addFile(bpy.sys.expandpath(image.filename)) job.addFile(bpy.utils.expandpath(image.filename))
########################### ###########################
# FLUID + POINT CACHE # FLUID + POINT CACHE
@@ -129,7 +129,7 @@ def clientSendJob(conn, scene, anim = False):
for object in bpy.data.objects: for object in bpy.data.objects:
for modifier in object.modifiers: for modifier in object.modifiers:
if modifier.type == 'FLUID_SIMULATION' and modifier.settings.type == "DOMAIN": if modifier.type == 'FLUID_SIMULATION' and modifier.settings.type == "DOMAIN":
addFluidFiles(job, bpy.sys.expandpath(modifier.settings.path)) addFluidFiles(job, bpy.utils.expandpath(modifier.settings.path))
elif modifier.type == "CLOTH": elif modifier.type == "CLOTH":
addPointCache(job, object, modifier.point_cache, default_path) addPointCache(job, object, modifier.point_cache, default_path)
elif modifier.type == "SOFT_BODY": elif modifier.type == "SOFT_BODY":

4
release/scripts/modules/bpy_sys.py
View File

@@ -26,5 +26,5 @@ def expandpath(path):
return path return path
import types import types
bpy.sys = types.ModuleType("bpy.sys") bpy.utils = types.ModuleType("bpy.utils")
bpy.sys.expandpath = expandpath bpy.utils.expandpath = expandpath

2
source/blender/python/intern/bpy_interface.c
View File

@@ -200,7 +200,7 @@ static void bpy_init_modules( void )
} }
bpy_import_test("bpy_ops"); /* adds its self to bpy.ops */ bpy_import_test("bpy_ops"); /* adds its self to bpy.ops */
bpy_import_test("bpy_sys"); /* adds its self to bpy.sys */ bpy_import_test("bpy_utils"); /* adds its self to bpy.sys */
bpy_import_test("bpy_ext"); /* extensions to our existing types */ bpy_import_test("bpy_ext"); /* extensions to our existing types */
} }