Ask for more Facebook Connect fields by default

diff --git a/tornado/auth.py b/tornado/auth.py
index 8d583d5629474c8583fd230c92543475098197d8..a88451555a9c199f8b2e2b19dfbf5d69eaa00f31 100644 (file)
--- a/tornado/auth.py
+++ b/tornado/auth.py
@@ -751,7 +751,8 @@ class FacebookMixin(object):
                 self._on_get_user_info, callback, session),
             session_key=session["session_key"],
             uids=session["uid"],
-            fields="uid,first_name,last_name,name,locale,pic_square")
+            fields="uid,first_name,last_name,name,locale,pic_square," \
+                   "profile_url,username")
 
     def facebook_request(self, method, callback, **args):
         """Makes a Facebook API REST request.
@@ -809,6 +810,9 @@ class FacebookMixin(object):
             "last_name": users[0]["last_name"],
             "uid": users[0]["uid"],
             "locale": users[0]["locale"],
+            "pic_square": users[0]["pic_square"],
+            "profile_url": users[0]["profile_url"],
+            "username": users[0].get("username"),
             "session_key": session["session_key"],
             "session_expires": session["expires"],
         })

diff --git a/tornado/database.py b/tornado/database.py
index 29a7305db5203fa683f482621524762157a65c11..1dde6bf8dd55c56e304863a7954ab6e40b824777 100644 (file)
--- a/tornado/database.py
+++ b/tornado/database.py
@@ -79,7 +79,7 @@ class Connection(object):
 
     def close(self):
         """Closes this database connection."""
-        if self._db is not None:
+        if getattr(self, "_db", None) is not None:
             self._db.close()
             self._db = None