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

cleanup: unused vars & wrong comment

Browse Source
This commit is contained in:
Campbell Barton
2014-12-16 11:48:09 +01:00
parent 441742a496
commit 27ec9f20a2
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/cli/bam.py
View File

@@ -457,7 +457,7 @@ class bam_commands:
@staticmethod @staticmethod
def update(paths): def update(paths):
# Load project configuration # Load project configuration
cfg = bam_config.load(abort=True) # cfg = bam_config.load(abort=True)
# TODO(cam) multiple paths # TODO(cam) multiple paths
session_rootdir = bam_config.find_sessiondir(paths[0], abort=True) session_rootdir = bam_config.find_sessiondir(paths[0], abort=True)
@@ -861,7 +861,6 @@ class bam_commands:
# bytes needed for blendfile_path_remap API # bytes needed for blendfile_path_remap API
paths = [p.encode('utf-8') for p in paths] paths = [p.encode('utf-8') for p in paths]
if not os.path.exists(filepath_remap): if not os.path.exists(filepath_remap):
fatal("Remap not started, run with 'start', (%r not found)" % filepath_remap) fatal("Remap not started, run with 'start', (%r not found)" % filepath_remap)
@@ -891,7 +890,6 @@ class bam_commands:
fatal("remapping not started, nothing to do!") fatal("remapping not started, nothing to do!")
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Argument Parser # Argument Parser

1
modules/bam_utils/system.py
View File

@@ -91,4 +91,3 @@ def write_json_to_file(path, data):
# optional (pretty) # optional (pretty)
sort_keys=True, indent=4, separators=(',', ': '), sort_keys=True, indent=4, separators=(',', ': '),
) )

2
tests/test_cli.py
View File

@@ -1463,7 +1463,7 @@ class BamRemapTest(BamSimpleTestCase):
# absolute path: (project relative) --> # absolute path: (project relative) -->
# checkout path: (relative to blend) # checkout path: (relative to blend)
blendfile_pair = ("shots/01/shot_01.blend", "new/deeply/nested/path/testme.blend") blendfile_pair = ("shots/01/shot_01.blend", "new/deeply/nested/path/testme.blend")
images =( images = (
("maps/generic.png", "foobar/another.png"), ("maps/generic.png", "foobar/another.png"),
("shots/01/maps/special.png", "blah/image.png"), ("shots/01/maps/special.png", "blah/image.png"),
) )

5
webservice/bam/application/__init__.py
View File

@@ -99,7 +99,7 @@ class DirectoryAPI(Resource):
parser = reqparse.RequestParser() parser = reqparse.RequestParser()
# parser.add_argument('rate', type=int, help='Rate cannot be converted') # parser.add_argument('rate', type=int, help='Rate cannot be converted')
parser.add_argument('path', type=str) parser.add_argument('path', type=str)
args = parser.parse_args() # args = parser.parse_args()
super(DirectoryAPI, self).__init__() super(DirectoryAPI, self).__init__()
def get(self, project_name): def get(self, project_name):
@@ -163,7 +163,7 @@ class FileAPI(Resource):
parser.add_argument('arguments', type=str) parser.add_argument('arguments', type=str)
parser.add_argument('files', type=werkzeug.datastructures.FileStorage, parser.add_argument('files', type=werkzeug.datastructures.FileStorage,
location='files') location='files')
args = parser.parse_args() # args = parser.parse_args()
super(FileAPI, self).__init__() super(FileAPI, self).__init__()
@@ -373,7 +373,6 @@ class FileAPI(Resource):
yield from blendfile_pack.pack( yield from blendfile_pack.pack(
filepath.encode('utf-8'), filepath_zip.encode('utf-8'), mode='ZIP', filepath.encode('utf-8'), filepath_zip.encode('utf-8'), mode='ZIP',
paths_remap_relbase=paths_remap_relbase.encode('utf-8'), paths_remap_relbase=paths_remap_relbase.encode('utf-8'),
# TODO(cam) this just means the json is written in the zip
deps_remap=deps_remap, paths_remap=paths_remap, paths_uuid=paths_uuid, deps_remap=deps_remap, paths_remap=paths_remap, paths_uuid=paths_uuid,
all_deps=all_deps, all_deps=all_deps,
report=report, report=report,