archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Campbell Barton
2014-11-27 13:10:40 +01:00
parent 4aabfb09dc
commit 85fd8513ae
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/gui/browser.py
View File

@@ -29,16 +29,17 @@ class PathHandle:
"json", "json",
"path", "path",
) )
def __init__(self): def __init__(self):
self.json = None self.json = None
# list of strings # list of strings
self.path = [] self.path = []
#self.filepath_set("gui.json") # self.filepath_set("gui.json")
self.refresh() self.refresh()
def refresh(self): def refresh(self):
import json # import json
# self.json = json.load(fp) # self.json = json.load(fp)
self.json = self.json_from_server(self.path) self.json = self.json_from_server(self.path)
print(self.json) print(self.json)

1
modules/blendfile_pack.py
View File

@@ -133,7 +133,6 @@ def pack(
assert((blendfile_src_dir_fakeroot is None) or assert((blendfile_src_dir_fakeroot is None) or
(not blendfile_src_dir_fakeroot.startswith(os.sep.encode('ascii')))) (not blendfile_src_dir_fakeroot.startswith(os.sep.encode('ascii'))))
path_temp_files = set() path_temp_files = set()
path_copy_files = set() path_copy_files = set()

2
tests/blendfile_templates.py
View File

@@ -62,8 +62,6 @@ def create_from_files(blendfile_root, _create_data, deps):
deps.append(f_abs) deps.append(f_abs)
if __name__ == "__main__": if __name__ == "__main__":
import sys import sys
blendfile, blendfile_root, blendfile_deps_json, create_id, create_data, returncode = sys.argv[-6:] blendfile, blendfile_root, blendfile_deps_json, create_id, create_data, returncode = sys.argv[-6:]

4
tests/test_cli.py
View File

@@ -307,7 +307,8 @@ def file_quick_touch(path, filepart=None, times=None):
def file_quick_image(path, filepart=None): def file_quick_image(path, filepart=None):
def write_png(buf, width, height): def write_png(buf, width, height):
""" buf: must be bytes or a bytearray in py3, a regular string in py2. formatted RGBARGBA... """ """ buf: must be bytes or a bytearray in py3, a regular string in py2. formatted RGBARGBA... """
import zlib, struct import zlib
import struct
width_byte_4 = width * 4 width_byte_4 = width * 4
raw_data = b''.join(b'\x00' + buf[span:span + width_byte_4] raw_data = b''.join(b'\x00' + buf[span:span + width_byte_4]
@@ -419,7 +420,6 @@ def blendfile_template_create_from_files(proj_path, session_path, blendfile, ima
assert(len(ret) == len(images)) assert(len(ret) == len(images))
def wait_for_input(): def wait_for_input():
"""for debugging, """for debugging,
so we can inspect the state of the system before the test finished. so we can inspect the state of the system before the test finished.