[ARVADOS] updated: 88ba4c97290a316568d89985636d7d2b8fbcfa92

git at public.curoverse.com git at public.curoverse.com
Mon Dec 29 15:09:04 EST 2014


Summary of changes:
 sdk/python/arvados/arvfile.py    | 4 ++--
 sdk/python/arvados/collection.py | 4 ++--
 sdk/python/tests/test_stream.py  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

       via  88ba4c97290a316568d89985636d7d2b8fbcfa92 (commit)
      from  a117d9790fc566653aead700f8cb207858c8fca9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 88ba4c97290a316568d89985636d7d2b8fbcfa92
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Dec 29 15:10:30 2014 -0500

    3198: Fix syntax errors

diff --git a/sdk/python/arvados/arvfile.py b/sdk/python/arvados/arvfile.py
index bb89b9d..b5d8189 100644
--- a/sdk/python/arvados/arvfile.py
+++ b/sdk/python/arvados/arvfile.py
@@ -237,7 +237,7 @@ class BufferBlock(object):
         return self.write_pointer
 
     def locator(self):
-        if self._locator is None
+        if self._locator is None:
             self._locator = "%s+%i" % (hashlib.md5(self.buffer_view[0:self.write_pointer]).hexdigest(), self.size())
         return self._locator
 
@@ -412,7 +412,7 @@ class ArvadosFile(object):
 
         self._modified = True
 
-        if self._current_bblock is None or self._current_bblock.state != BufferBlock.WRITABLE::
+        if self._current_bblock is None or self._current_bblock.state != BufferBlock.WRITABLE:
             self._current_bblock = self.bbm.alloc_bufferblock()
 
         if (self._current_bblock.size() + len(data)) > config.KEEP_BLOCK_SIZE:
diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index da359e8..3cbbca2 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -888,7 +888,7 @@ class Collection(CollectionBase):
                 self._api_response = self._api_client.collections().update(
                     uuid=self._manifest_locator,
                     body={'manifest_text': self.manifest_text(strip=False)}
-                    }).execute(
+                    ).execute(
                         num_retries=self.num_retries)
             else:
                 raise AssertionError("Collection manifest_locator must be a collection uuid.  Use save_as() for new collections.")
@@ -901,7 +901,7 @@ class Collection(CollectionBase):
                 "name": name}
         if owner_uuid:
             body["owner_uuid"] = owner_uuid
-        self._api_response = self._api_client.collections().create(body=body}).execute(num_retries=self.num_retries)
+        self._api_response = self._api_client.collections().create(body=body).execute(num_retries=self.num_retries)
         self._manifest_locator = self._api_response["uuid"]
         self.set_unmodified()
 
diff --git a/sdk/python/tests/test_stream.py b/sdk/python/tests/test_stream.py
index dfff394..e246d91 100644
--- a/sdk/python/tests/test_stream.py
+++ b/sdk/python/tests/test_stream.py
@@ -272,6 +272,6 @@ class StreamFileReadAllDecompressedTestCase(StreamFileReadTestCase):
 class StreamFileReadlinesTestCase(StreamFileReadTestCase):
     def read_for_test(self, reader, byte_count, **kwargs):
         return ''.join(reader.readlines(**kwargs))
-o
+
 if __name__ == '__main__':
     unittest.main()

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list