Merge branch 'master' of https://code.grnet.gr/git/pithos

diff --git a/pithos/aai/models.py b/pithos/aai/models.py
index 959edfb..ca964b0 100644 (file)
--- a/pithos/aai/models.py
+++ b/pithos/aai/models.py
@@ -31,6 +31,8 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
+import datetime
+
 from django.db import models
 
 from pithos import settings

diff --git a/pithos/backends/modular.py b/pithos/backends/modular.py
index 8b7282f..6deeafc 100644 (file)
--- a/pithos/backends/modular.py
+++ b/pithos/backends/modular.py
@@ -706,6 +706,10 @@ class ModularBackend(BaseBackend):
             if props is None:
                 raise NameError('Object does not exist')
         else:
+            try:
+                version = int(version)
+            except ValueError:
+                raise IndexError('Version does not exist')
             props = self.node.version_get_properties(version)
             if props is None or props[self.CLUSTER] == CLUSTER_DELETED:
                 raise IndexError('Version does not exist')
@@ -746,11 +750,6 @@ class ModularBackend(BaseBackend):
         
         return src_version_id, dest_version_id
     
-    def _get_metadata(self, version):
-        if version is None:
-            return {}
-        return dict(self.node.attribute_get(version))
-    
     def _put_metadata(self, user, node, meta, replace=False, copy_data=True):
         """Create a new version and store metadata."""