reverted Pickleable until we understand it better

This commit is contained in:
Massimo Di Pierro
2011-12-17 22:07:36 -06:00
parent 34461c0ee1
commit e66fb147dd
4 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -24,7 +24,7 @@ import cStringIO
from email import MIMEBase, MIMEMultipart, MIMEText, Encoders, Header, message_from_string
from contenttype import contenttype
from storage import Storage, PickeableStorage, StorageList, Settings, Messages
from storage import Storage, PickleableStorage, StorageList, Settings, Messages
from utils import web2py_uuid
from fileutils import read_file
from gluon import *
@@ -1494,7 +1494,7 @@ class Auth(object):
if user:
password = table_user[passfield].validate(password)[0]
if not user.registration_key and user[passfield] == password:
user = PickeableStorage(user)
user = Storage(table_user._filter_fields(user, id=True))
session.auth = Storage(user=user, last_visit=request.now,
expiration=self.settings.expiration,
hmac_key = web2py_uuid())
@@ -1771,7 +1771,7 @@ class Auth(object):
# process authenticated users
if user:
user = PickeableStorage(user)
user = Storage(table_user._filter_fields(user, id=True))
# process authenticated users
# user wants to be logged in for longer