arvados.git
10 years ago3505: Fix typo in run-command
Peter Amstutz [Thu, 14 Aug 2014 15:41:45 +0000 (11:41 -0400)]
3505: Fix typo in run-command

10 years ago3505: Move helper scripts into crunchutil module. In run-command, added
Peter Amstutz [Thu, 14 Aug 2014 15:35:06 +0000 (11:35 -0400)]
3505: Move helper scripts into crunchutil module.  In run-command, added
task.stdin redirection, and renamed save.stdout to task.stdout for consistency.
Stylistic change "x == None" and "x != None" to "x is None" and "x is not
None".

10 years ago3505: Fixed typo comparison of list against 0 instead of len(list).
Peter Amstutz [Wed, 13 Aug 2014 18:44:27 +0000 (14:44 -0400)]
3505: Fixed typo comparison of list against 0 instead of len(list).

10 years ago3505: Adjust order of initialization to reflect potential side effects (e.g. file
Peter Amstutz [Wed, 13 Aug 2014 18:25:44 +0000 (14:25 -0400)]
3505: Adjust order of initialization to reflect potential side effects (e.g. file
creation) on using functions such as $(glob) in the command.

10 years agoAdded virtual working directory "task.vwd" option to run-command. Added
Peter Amstutz [Wed, 13 Aug 2014 15:04:52 +0000 (11:04 -0400)]
Added virtual working directory "task.vwd" option to run-command.  Added
"task.cwd" to set the starting directory.  Refactored upload retry logic from
run-command into robust_put.py and modified decompress-all to use it.  no issue #

10 years agoFix regular expression in decompress-all.py refs #3373
Peter Amstutz [Tue, 12 Aug 2014 17:16:04 +0000 (13:16 -0400)]
Fix regular expression in decompress-all.py  refs #3373

10 years agoFix syntax error in decompress-all.py refs #3373
Peter Amstutz [Tue, 12 Aug 2014 17:07:12 +0000 (13:07 -0400)]
Fix syntax error in decompress-all.py  refs #3373

10 years agoMerge branch '3373-improve-gatk3-snv-pipeline' closes #3373
Peter Amstutz [Tue, 12 Aug 2014 15:42:55 +0000 (11:42 -0400)]
Merge branch '3373-improve-gatk3-snv-pipeline' closes #3373

10 years ago3373: Test filename extension before attempting to call dtrx. Non-zero dtrx exit...
Peter Amstutz [Tue, 12 Aug 2014 15:42:09 +0000 (11:42 -0400)]
3373: Test filename extension before attempting to call dtrx.  Non-zero dtrx exit code is now treated as failure.

10 years agoMerge branch '3178-discoverable-parameters' closes #3178
Tom Clegg [Tue, 12 Aug 2014 14:11:32 +0000 (10:11 -0400)]
Merge branch '3178-discoverable-parameters' closes #3178

10 years ago3572: Set state to RunningOnServer if --submit given. closes #3572
Tom Clegg [Tue, 12 Aug 2014 14:09:41 +0000 (10:09 -0400)]
3572: Set state to RunningOnServer if --submit given. closes #3572

10 years agoMerge branch '3570-crunch-race' closes #3570
Tom Clegg [Tue, 12 Aug 2014 13:12:27 +0000 (09:12 -0400)]
Merge branch '3570-crunch-race' closes #3570

10 years agoMerge branch '3412-full-collections-index'
Brett Smith [Tue, 12 Aug 2014 12:59:23 +0000 (08:59 -0400)]
Merge branch '3412-full-collections-index'

Closes #3412, #3534.

10 years ago3412: Make manifest_text selectable from Collections index API.
Brett Smith [Mon, 11 Aug 2014 19:49:52 +0000 (15:49 -0400)]
3412: Make manifest_text selectable from Collections index API.

10 years ago3412: Make non-database fields selectable from API server.
Brett Smith [Mon, 11 Aug 2014 19:48:09 +0000 (15:48 -0400)]
3412: Make non-database fields selectable from API server.

This makes it possible to pass method-back field names, like
"data_size" and "files" from Collections, to the select parameter.

10 years ago3412: Refactor common manifest munging in API Collections controller.
Brett Smith [Thu, 7 Aug 2014 19:15:57 +0000 (15:15 -0400)]
3412: Refactor common manifest munging in API Collections controller.

10 years ago3412: Clean API Collections controller trailing whitespace.
Brett Smith [Thu, 7 Aug 2014 19:14:36 +0000 (15:14 -0400)]
3412: Clean API Collections controller trailing whitespace.

10 years agoUpdate more PGP web links. No issue #
Tom Clegg [Tue, 12 Aug 2014 04:14:09 +0000 (00:14 -0400)]
Update more PGP web links. No issue #

10 years agoUpdate PGP download link. No issue #
Tom Clegg [Tue, 12 Aug 2014 03:49:26 +0000 (23:49 -0400)]
Update PGP download link. No issue #

10 years ago3178: Merge bogus _setup_requires_parameters into existing class method.
Tom Clegg [Mon, 11 Aug 2014 23:01:08 +0000 (19:01 -0400)]
3178: Merge bogus _setup_requires_parameters into existing class method.

10 years ago3570: Use exit code 75 to mean "temporary locking failure". Add comments.
Tom Clegg [Mon, 11 Aug 2014 22:33:52 +0000 (18:33 -0400)]
3570: Use exit code 75 to mean "temporary locking failure". Add comments.

10 years agoMerge branch '3489-indicate-initial-project-filter' closes #3489
Tom Clegg [Mon, 11 Aug 2014 21:54:39 +0000 (17:54 -0400)]
Merge branch '3489-indicate-initial-project-filter' closes #3489

10 years agoMerge branch '3570-crunch-race' closes #3570
Tom Clegg [Mon, 11 Aug 2014 21:06:46 +0000 (17:06 -0400)]
Merge branch '3570-crunch-race' closes #3570

10 years ago3489: Add test for correct dropdown text.
Tom Clegg [Mon, 11 Aug 2014 19:07:22 +0000 (15:07 -0400)]
3489: Add test for correct dropdown text.

10 years ago3489: Degrade nicely if initial filter refers to an unreadable project.
Tom Clegg [Mon, 11 Aug 2014 18:56:15 +0000 (14:56 -0400)]
3489: Degrade nicely if initial filter refers to an unreadable project.

10 years ago3489: Remove debug comment.
Tom Clegg [Mon, 11 Aug 2014 18:54:35 +0000 (14:54 -0400)]
3489: Remove debug comment.

10 years agoFix broken link again. refs #3254
Peter Amstutz [Mon, 11 Aug 2014 18:20:57 +0000 (14:20 -0400)]
Fix broken link again. refs #3254

10 years agoFix broken links. refs #3254
Peter Amstutz [Mon, 11 Aug 2014 18:03:31 +0000 (14:03 -0400)]
Fix broken links. refs #3254

10 years agoMerge branch '3254-run-job-locally-docs' closes #3254 refs #3556
Peter Amstutz [Mon, 11 Aug 2014 17:43:56 +0000 (13:43 -0400)]
Merge branch '3254-run-job-locally-docs' closes #3254 refs #3556

10 years ago3254: Typo fix "reproducibilty" -> "reproducibility". Changed use of the term "paral...
Peter Amstutz [Mon, 11 Aug 2014 17:37:41 +0000 (13:37 -0400)]
3254: Typo fix "reproducibilty" -> "reproducibility".  Changed use of the term "parallel" to "concurrent" refs #3556

10 years ago3570: Do not fail the job when crunch-job loses a locking race during startup.
Tom Clegg [Mon, 11 Aug 2014 17:25:48 +0000 (13:25 -0400)]
3570: Do not fail the job when crunch-job loses a locking race during startup.

10 years agoMerge branch '3212-pipeline-no-reuse' closes #3212
Tom Clegg [Mon, 11 Aug 2014 14:59:15 +0000 (10:59 -0400)]
Merge branch '3212-pipeline-no-reuse' closes #3212

10 years ago3178: Discover required parameters for regular CRUD methods, too.
Tom Clegg [Sun, 10 Aug 2014 22:15:06 +0000 (18:15 -0400)]
3178: Discover required parameters for regular CRUD methods, too.

10 years ago3178: Use different discovery doc cache files for different API servers.
Tom Clegg [Sun, 10 Aug 2014 21:51:38 +0000 (17:51 -0400)]
3178: Use different discovery doc cache files for different API servers.

Also port "use api even if discovery cache file can't be written"
rescue block from arvados-cli to arvados gem.

10 years ago3178: Add missing jobs.create and users.setup parameters to discovery document.
Tom Clegg [Sun, 10 Aug 2014 21:34:34 +0000 (17:34 -0400)]
3178: Add missing jobs.create and users.setup parameters to discovery document.

10 years ago3212: Support arv-run-pipeline-instance --no-reuse --submit
Tom Clegg [Sat, 9 Aug 2014 21:15:43 +0000 (17:15 -0400)]
3212: Support arv-run-pipeline-instance --no-reuse --submit

10 years agoFix repositories.get_all_permissions, add tests. closes #3546
Tom Clegg [Fri, 8 Aug 2014 21:32:03 +0000 (17:32 -0400)]
Fix repositories.get_all_permissions, add tests. closes #3546

10 years ago3373: split-fastq: Fix loop
Peter Amstutz [Fri, 8 Aug 2014 20:56:29 +0000 (16:56 -0400)]
3373: split-fastq: Fix loop

10 years ago3373: split-fastq: Fix regex again
Peter Amstutz [Fri, 8 Aug 2014 20:45:45 +0000 (16:45 -0400)]
3373: split-fastq: Fix regex again

10 years ago3489: Indicate initially selected project in chooser. closes #3544
Tom Clegg [Fri, 8 Aug 2014 20:45:12 +0000 (16:45 -0400)]
3489: Indicate initially selected project in chooser. closes #3544

10 years ago3373: Fix wrong regex group
Peter Amstutz [Fri, 8 Aug 2014 20:39:05 +0000 (16:39 -0400)]
3373: Fix wrong regex group

10 years ago3373: Fix syntax error in split-fastq
Peter Amstutz [Fri, 8 Aug 2014 20:33:52 +0000 (16:33 -0400)]
3373: Fix syntax error in split-fastq

10 years ago3373: more run-command cleanup, global p -> taskp, tweaked logging levels
Peter Amstutz [Fri, 8 Aug 2014 20:15:55 +0000 (16:15 -0400)]
3373: more run-command cleanup, global p -> taskp, tweaked logging levels

10 years agoMerge branch '2769-disable-delete-flag' closes #2769
Tom Clegg [Fri, 8 Aug 2014 20:04:51 +0000 (16:04 -0400)]
Merge branch '2769-disable-delete-flag' closes #2769

10 years ago3373: arv-run-pipeline-instance: removed .to_json where objects are supplied to ...
Peter Amstutz [Fri, 8 Aug 2014 20:01:06 +0000 (16:01 -0400)]
3373: arv-run-pipeline-instance: removed .to_json where objects are supplied to :body_object and will be serialized anyway.

10 years agoFix excessive API calls in collection chooser. refs #3489
Tom Clegg [Fri, 8 Aug 2014 19:58:53 +0000 (15:58 -0400)]
Fix excessive API calls in collection chooser. refs #3489

10 years ago3373: Switch run-command to use python logging instead of print.
Peter Amstutz [Fri, 8 Aug 2014 19:55:48 +0000 (15:55 -0400)]
3373: Switch run-command to use python logging instead of print.

10 years ago3373: split-fastq: merge loops to capture both single and paired fastq files.
Peter Amstutz [Fri, 8 Aug 2014 19:46:49 +0000 (15:46 -0400)]
3373: split-fastq: merge loops to capture both single and paired fastq files.
Will now error out if there are fastq files in subdirectories instead of
ignoring them silently.  Added comment about splitfastq() function.

10 years ago3373: decompress-all: cleaned up code a bit. Fail properly with error message on...
Peter Amstutz [Fri, 8 Aug 2014 19:44:51 +0000 (15:44 -0400)]
3373: decompress-all: cleaned up code a bit.  Fail properly with error message on bad input.

10 years ago2769: Add -never-delete command line flag.
Tom Clegg [Fri, 8 Aug 2014 19:13:24 +0000 (15:13 -0400)]
2769: Add -never-delete command line flag.

10 years agoAdd "wait_for_ajax" to avoid race condition. No issue #
Tom Clegg [Fri, 8 Aug 2014 17:51:42 +0000 (13:51 -0400)]
Add "wait_for_ajax" to avoid race condition. No issue #

10 years agoMerge branch '3527-infer-docker-hash-wip'
Brett Smith [Fri, 8 Aug 2014 17:51:25 +0000 (13:51 -0400)]
Merge branch '3527-infer-docker-hash-wip'

Closes #3527, #3529.

10 years ago3527: Support using a Docker image from any stream in a Collection.
Brett Smith [Fri, 8 Aug 2014 17:44:00 +0000 (13:44 -0400)]
3527: Support using a Docker image from any stream in a Collection.

This makes Docker image detection more consistent between crunch-job
and the API server, and is more user-friendly.

10 years ago3527: Find Docker images natively inside Collections.
Brett Smith [Fri, 8 Aug 2014 14:46:51 +0000 (10:46 -0400)]
3527: Find Docker images natively inside Collections.

We previously relied on the docker_image_hash link to treat a
Collection as a Docker image.  This was safer and simpler, but it
creates obstacles for project sharing.  When we have a Collection
locator that we want to treat as a Docker image, we now check that it
has a single file with a single 64-hexdigit tar file in it, and use
that as the hash if so.  This should still prevent clear mistakes
while removing some of the obstacles to sharing.

10 years agoHide preview pane on narrow screens. closes #3496
Tom Clegg [Fri, 8 Aug 2014 17:39:36 +0000 (13:39 -0400)]
Hide preview pane on narrow screens. closes #3496

10 years agoUpdate tests and user setup methods. refs #3525
Tom Clegg [Fri, 8 Aug 2014 17:14:59 +0000 (13:14 -0400)]
Update tests and user setup methods. refs #3525

10 years agoMerge branch '3499-home-project' closes #3499
Tom Clegg [Fri, 8 Aug 2014 15:44:50 +0000 (11:44 -0400)]
Merge branch '3499-home-project' closes #3499

10 years agoMerge branch '3525-manage-own-repo' refs #3525
Tom Clegg [Fri, 8 Aug 2014 15:31:32 +0000 (11:31 -0400)]
Merge branch '3525-manage-own-repo' refs #3525

10 years ago3499: Remove "not in any project" warning.
Tom Clegg [Fri, 8 Aug 2014 15:27:08 +0000 (11:27 -0400)]
3499: Remove "not in any project" warning.

10 years ago3499: Do not show Home in breadcrumbs when viewing dashboard page.
Tom Clegg [Fri, 8 Aug 2014 14:26:33 +0000 (10:26 -0400)]
3499: Do not show Home in breadcrumbs when viewing dashboard page.

10 years ago3499: Do not show "Sharing" tab on Home project.
Tom Clegg [Fri, 8 Aug 2014 13:41:17 +0000 (09:41 -0400)]
3499: Do not show "Sharing" tab on Home project.

10 years ago3499: Show "Home" in "My projects" panel on dashboard.
Tom Clegg [Fri, 8 Aug 2014 13:38:31 +0000 (09:38 -0400)]
3499: Show "Home" in "My projects" panel on dashboard.

10 years ago3499: Do not show "Move" and "Delete" buttons on Home project.
Tom Clegg [Fri, 8 Aug 2014 13:31:11 +0000 (09:31 -0400)]
3499: Do not show "Move" and "Delete" buttons on Home project.

10 years ago3499: Merge branch 'master' into 3499-home-project
Tom Clegg [Fri, 8 Aug 2014 00:00:30 +0000 (20:00 -0400)]
3499: Merge branch 'master' into 3499-home-project

10 years ago3499: Update arv-put usage message to reflect new behavior.
Tom Clegg [Thu, 7 Aug 2014 23:56:38 +0000 (19:56 -0400)]
3499: Update arv-put usage message to reflect new behavior.

10 years ago3499: Reconcile Python tests to new arv-put "home project" behavior.
Tom Clegg [Thu, 7 Aug 2014 23:47:53 +0000 (19:47 -0400)]
3499: Reconcile Python tests to new arv-put "home project" behavior.

10 years ago3499: Fix Python SDK tests to accept signed blob locators.
Tom Clegg [Thu, 7 Aug 2014 23:46:36 +0000 (19:46 -0400)]
3499: Fix Python SDK tests to accept signed blob locators.

10 years ago3499: Improve Python SDK's ability to read apiserver's config files.
Tom Clegg [Thu, 7 Aug 2014 23:45:12 +0000 (19:45 -0400)]
3499: Improve Python SDK's ability to read apiserver's config files.

Use a hardcoded secret in the default "test" configuration, rather
than generating a random string with erb. Otherwise, the Python test
suite can't figure out what blob signing key the test server actually
ends up using.

10 years agoMerge branch '3036-mutable-collections' refs #3504
Tom Clegg [Thu, 7 Aug 2014 20:46:20 +0000 (16:46 -0400)]
Merge branch '3036-mutable-collections' refs #3504

10 years ago3036: Merge branch 'master' into 3036-mutable-collections
Tom Clegg [Thu, 7 Aug 2014 20:32:59 +0000 (16:32 -0400)]
3036: Merge branch 'master' into 3036-mutable-collections

10 years ago3036: Remove unnecessary code path.
Tom Clegg [Thu, 7 Aug 2014 20:32:25 +0000 (16:32 -0400)]
3036: Remove unnecessary code path.

10 years ago3525: Users can manage permissions on their own repositories
Tom Clegg [Thu, 7 Aug 2014 19:59:27 +0000 (15:59 -0400)]
3525: Users can manage permissions on their own repositories

10 years ago3499: arv-put collections in home project if no --project-uuid specified.
Tom Clegg [Thu, 7 Aug 2014 14:58:31 +0000 (10:58 -0400)]
3499: arv-put collections in home project if no --project-uuid specified.

10 years agoMerge branch 'master' into 3373-improve-gatk3-snv-pipeline
Peter Amstutz [Thu, 7 Aug 2014 14:49:50 +0000 (10:49 -0400)]
Merge branch 'master' into 3373-improve-gatk3-snv-pipeline

10 years ago3438: Show input title when choosing Collections for pipeline instances.
Brett Smith [Thu, 7 Aug 2014 14:44:53 +0000 (10:44 -0400)]
3438: Show input title when choosing Collections for pipeline instances.

Closes #3438.

10 years ago"Writing a crunch script" now shows how to run locally, "Running on an Arvados cluste...
Peter Amstutz [Thu, 7 Aug 2014 14:44:31 +0000 (10:44 -0400)]
"Writing a crunch script" now shows how to run locally, "Running on an Arvados cluster" shows how to commit to git and create a pipeline template.

10 years ago3482: crunch-job logs locator of job output sans permission hints.
Brett Smith [Thu, 7 Aug 2014 13:54:07 +0000 (09:54 -0400)]
3482: crunch-job logs locator of job output sans permission hints.

This makes crunch-job log a locator that's consistent with the output
locator that it sets for the job in the database.  Closes #3482.

10 years agoRe-disable preview pane in project sharing popup.
Brett Smith [Thu, 7 Aug 2014 13:10:31 +0000 (09:10 -0400)]
Re-disable preview pane in project sharing popup.

This was the original behavior, but was lost in a later merge.
No issue #.

10 years ago3436: Don't show Projects pulldown on project sharing popups.
Brett Smith [Thu, 7 Aug 2014 12:44:21 +0000 (08:44 -0400)]
3436: Don't show Projects pulldown on project sharing popups.

Closes #3436.

10 years ago3499: Merge branch 'master' into 3499-home-project
Tom Clegg [Wed, 6 Aug 2014 23:19:50 +0000 (19:19 -0400)]
3499: Merge branch 'master' into 3499-home-project

10 years ago3499: Show Home at root of projects tree. closes #3517
Tom Clegg [Wed, 6 Aug 2014 23:16:03 +0000 (19:16 -0400)]
3499: Show Home at root of projects tree. closes #3517

10 years ago3499: Show home project at /projects/{user_uuid}. closes #3515
Tom Clegg [Wed, 6 Aug 2014 23:07:30 +0000 (19:07 -0400)]
3499: Show home project at /projects/{user_uuid}. closes #3515

10 years ago3499: Update breadcrumbs. closes #3513
Tom Clegg [Wed, 6 Aug 2014 22:41:43 +0000 (18:41 -0400)]
3499: Update breadcrumbs. closes #3513

10 years ago3499: groups/{user_uuid}/contents returns home project contents. closes #3514
Tom Clegg [Wed, 6 Aug 2014 22:36:06 +0000 (18:36 -0400)]
3499: groups/{user_uuid}/contents returns home project contents. closes #3514

10 years ago3388: Workbench only lists user groups when sharing a project with groups.
Brett Smith [Wed, 6 Aug 2014 22:16:10 +0000 (18:16 -0400)]
3388: Workbench only lists user groups when sharing a project with groups.

This ensures that projects aren't included in the listing, which is
not useful and confusing.  Closes #3388.

10 years ago3427: Restore arv-put's resume functionality.
Brett Smith [Wed, 6 Aug 2014 21:28:12 +0000 (17:28 -0400)]
3427: Restore arv-put's resume functionality.

The refactoring in 0d1a48e accidentally introduced a bug where arv-put
wipes its resume cache clean before building the uploader.  Because
the refactor always arranges `resume_cache = None` when the user
doesn't want to resume, we can fix the bug by just skipping the wipe.
Closes #3427.

10 years agoMerge branch '3463-make-sharing-dialog-with-users-more-useful' closes #3463
Tom Clegg [Wed, 6 Aug 2014 15:49:50 +0000 (11:49 -0400)]
Merge branch '3463-make-sharing-dialog-with-users-more-useful' closes #3463

10 years agoMerge branch '3444-no-folders' closes #3444
Tom Clegg [Wed, 6 Aug 2014 15:37:50 +0000 (11:37 -0400)]
Merge branch '3444-no-folders' closes #3444

10 years ago3444: Update documentation referring to obsolete group_class=folder
Tom Clegg [Wed, 6 Aug 2014 15:37:20 +0000 (11:37 -0400)]
3444: Update documentation referring to obsolete group_class=folder

10 years agoMerge branch '3372-update-pipeline-template-schema-docs' refs #3372
Peter Amstutz [Wed, 6 Aug 2014 14:52:15 +0000 (10:52 -0400)]
Merge branch '3372-update-pipeline-template-schema-docs' refs #3372

10 years agoAdd documentation to PipelineTemplate schema for title, description, link_name of...
Peter Amstutz [Wed, 6 Aug 2014 14:48:52 +0000 (10:48 -0400)]
Add documentation to PipelineTemplate schema for title, description, link_name of pipeline template script_parameters.

10 years ago3444: Remove support for obsolete group_class=folder
Tom Clegg [Wed, 6 Aug 2014 14:40:26 +0000 (10:40 -0400)]
3444: Remove support for obsolete group_class=folder

10 years agoMerge branch 'master' into 3373-improve-gatk3-snv-pipeline
Peter Amstutz [Wed, 6 Aug 2014 14:32:01 +0000 (10:32 -0400)]
Merge branch 'master' into 3373-improve-gatk3-snv-pipeline

10 years agoDisable chunking
Peter Amstutz [Tue, 5 Aug 2014 20:57:03 +0000 (20:57 +0000)]
Disable chunking

10 years agoMerge branch '3415-py-sdk-api-errors-wip'
Brett Smith [Tue, 5 Aug 2014 20:42:00 +0000 (16:42 -0400)]
Merge branch '3415-py-sdk-api-errors-wip'

Refs #3415.  Closes #3478.

10 years agoChunking fastq seems to work, but is very slow.
Peter Amstutz [Tue, 5 Aug 2014 20:10:17 +0000 (20:10 +0000)]
Chunking fastq seems to work, but is very slow.

10 years ago3415: API exceptions from Python SDK include more error information.
Brett Smith [Tue, 5 Aug 2014 19:18:14 +0000 (15:18 -0400)]
3415: API exceptions from Python SDK include more error information.

The apiclient module doesn't give us a lot of opportunities to
customize error handling.  Request objects can have response
callbacks, but they only get access to the response headers, not body,
which we need to pass along JSON errors.  After that, apiclient.http
imports apiclient.errors.HttpError directly, and raises that directly
whenever there's a permanent error in an HTTP response.

arvados.api already makes a few monkeypatches to apiclient, and this
commit adds one more: it customizes HttpError's __new__ method to
return a new customized subclass instead.  This is pretty evil,
because it will mess with any other instantiations of HttpError in
client programs.  Its only mitigating grace is that the new subclass
is fully API-compatible with the original.

10 years agoarvados.LOCATOR
Peter Amstutz [Tue, 5 Aug 2014 17:38:20 +0000 (13:38 -0400)]
arvados.LOCATOR

10 years agoimport string
Peter Amstutz [Tue, 5 Aug 2014 17:37:11 +0000 (13:37 -0400)]
import string

10 years agoFix syntax error
Peter Amstutz [Tue, 5 Aug 2014 17:36:14 +0000 (13:36 -0400)]
Fix syntax error