aboutsummaryrefslogtreecommitdiffstats
path: root/server/object.py
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2011-04-27 01:04:03 -0400
committerGuillaume Horel <guillaume.horel@gmail.com>2011-04-27 01:04:03 -0400
commitb38e784e1aeb0b3f3db4a8a33799c4bd94a5d10a (patch)
tree6df5fa411b7db980869d259de4319f762baa705d /server/object.py
parentd045912cb5b4e49140514b7dbf2ca4bc5ca5098f (diff)
downloadalias-b38e784e1aeb0b3f3db4a8a33799c4bd94a5d10a.tar.gz
Preliminary work for in-band registration.
Diffstat (limited to 'server/object.py')
-rw-r--r--server/object.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/server/object.py b/server/object.py
index 6a5e45c..7a2e46f 100644
--- a/server/object.py
+++ b/server/object.py
@@ -8,6 +8,7 @@ import zlib
import datetime
import fileinput
import logging
+import pickle
logger = logging.getLogger(__name__)
from permission import *
@@ -93,11 +94,11 @@ class ObjectReader(Object):
file.close()
return content, key
- def get_private_key(self):
+ def get_registration_data(self):
pass
class ObjectWriter(Object):
- def __init__(self, owner, hash = None):
+ def __init__(self, owner, hash = None, content):
Object.__init__(self, owner, hash)
if not os.path.exists(self.owner_path):
logger.error("User {} is not registered".format(self.owner))