Merge branch 'master' of git://github.com/igorgue/pyfacebook

tubaman · May 18, 2010 · d096354 · d096354
2 parents 274d3e0 + d06978f
commit d096354
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/facebook/__init__.py b/facebook/__init__.py
@@ -1331,7 +1331,11 @@ def check_session(self, request):
             self.added = True
 
         if params.get('expires'):
-            self.session_key_expires = int(params['expires'])
+            # workaround for http://github.com/sciyoshi/pyfacebook/issues/#issue/26 -- RAN 20100123
+            try:
+                self.session_key_expires = int(params['expires'])
+            except ValueError:
+                self.session_key_expires = None
 
         if 'locale' in params:
             self.locale = params['locale']

diff --git a/facebook/djangofb/__init__.py b/facebook/djangofb/__init__.py
@@ -223,26 +223,4 @@ def process_response(self, request, response):
                 expiry = datetime.datetime.fromtimestamp(request.facebook.session_key_expires)
                 request.session.set_expiry(expiry)
 
-        try:
-            fb = request.facebook
-        except:
-            return response
-
-        if not fb.is_session_from_cookie:
-            # Make sure the browser accepts our session cookies inside an Iframe
-            response['P3P'] = 'CP="NOI DSP COR NID ADMa OPTa OUR NOR"'
-            fb_cookies = {
-                'expires': fb.session_key_expires,
-                'session_key': fb.session_key,
-                'user': fb.uid,
-            }
-
-            expire_time = None
-            if fb.session_key_expires:
-                expire_time = datetime.utcfromtimestamp(fb.session_key_expires)
-
-            for k in fb_cookies:
-                response.set_cookie(self.api_key + '_' + k, fb_cookies[k], expires=expire_time)
-            response.set_cookie(self.api_key , fb._hash_args(fb_cookies), expires=expire_time)
-
         return response
diff --git a/facebook/djangofb/default_app/models.py b/facebook/djangofb/default_app/models.py
@@ -25,7 +25,7 @@ class User(models.Model):
     # TODO: The data that you want to store for each user would go here.
     # For this sample, we let users let people know their favorite progamming
     # language, in the spirit of Extended Info.
-    language = models.CharField(maxlength=64, default='Python')
+    language = models.CharField(max_length=64, default='Python')
 
     # Add the custom manager
     objects = UserManager()