Preparing for merge with main branch - more clean-ups and documents update

diff --git a/README.rst b/README.rst
index 2fddd117f8eb6a234d4c8abf75c99bd72763459d..f185e05dcb45d876a6508ff283592dc6df8955d0 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -747,6 +747,9 @@ http://127.0.0.1:8000 or http://localhost:8000 because it won't work when
 testing. Instead I define http://myapp.com and setup a mapping on /etc/hosts
 or use dnsmasq_.
 
+If you need to perform authentication from Facebook Canvas application, take a
+look to `Facebook Canvas Application Authentication`_.
+
 Orkut
 ^^^^^
 
@@ -1140,6 +1143,7 @@ Mailing list
 Join to `django-social-auth discussion list`_ and bring any questions or suggestions
 that would improve this application. Convore_ discussion group is deprecated since
 the service is going to be shut down on April 1st.
+
 South users
 ^^^^^^^^^^^
 South_ users should add this rule to enable migrations::
@@ -1348,4 +1352,5 @@ Base work is copyrighted by:
 .. _hassek: https://github.com/hassek
 .. _Mail.ru OAuth: http://api.mail.ru/docs/guides/oauth/
 .. _Odnoklassniki OAuth: http://dev.odnoklassniki.ru/wiki/display/ok/The+OAuth+2.0+Protocol
-.. _authentication for VKontakte applications: http://www.ikrvss.ru/2011/11/08/django-social-auh-and-vkontakte-application/
\ No newline at end of file
+.. _authentication for VKontakte applications: http://www.ikrvss.ru/2011/11/08/django-social-auh-and-vkontakte-application/
+.. _Facebook Canvas Application Authentication: http://www.ikrvss.ru/2011/09/22/django-social-auth-and-facebook-canvas-applications/
\ No newline at end of file

diff --git a/example/local_settings.py.template b/example/local_settings.py.template
index 827b9e025fd1a1a9d171560943daa6213522556e..c20f8005ca40f3644abcaa12de61b201b21cc87f 100644 (file)
--- a/example/local_settings.py.template
+++ b/example/local_settings.py.template
@@ -54,4 +54,4 @@ SOCIAL_AUTH_PIPELINE = (
     'social_auth.backends.pipeline.social.associate_user',
     'social_auth.backends.pipeline.social.load_extra_data',
     'social_auth.backends.pipeline.user.update_user_details',
-)
\ No newline at end of file
+)

diff --git a/example/templates/done.html b/example/templates/done.html
index 9200e52e386fa234b8bd01de9fae9bfb614862c6..c21d950f619c3a4a2a7d41c6e880790bb0ea753d 100644 (file)
--- a/example/templates/done.html
+++ b/example/templates/done.html
@@ -65,18 +65,7 @@
       </form>
       {% else %}
         {% if name == "openid" %}
-      <form action="{% url socialauth_associate_begin "yandex" %}" method="post">{% csrf_token %}
-        <div>
-          <label for="openid_ya_user">Yandex user
-            {% if yandex %}(<span class="disconnect"><a href="{% url disconnect "yandex" %}">disconnect</a>)</span>{% endif %}
-          </label>
-          <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
-          <input type="submit" value="Login"/>
-        </div>
-      </form>
-    </li>
-    <li>
-        <form action="{% url socialauth_associate_begin "openid" %}" method="post">{% csrf_token %}
+        <form action="{% url socialauth_begin "openid" %}" method="post">{% csrf_token %}
           <div>
             <label for="openid_identifier">Other provider</label>
             <input id="openid_identifier" type="text" value="" name="openid_identifier" />

diff --git a/setup.py b/setup.py
index d062c089921ff0db92ea9ca90885680613e7a0f8..583a39711d97156ab05aa93f2c0ad8920768e63f 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ setup(name='django-social-auth',
       install_requires=['django>=1.2.5',
                         'oauth2>=1.5.167',
                         'python_openid>=2.2'],
-    classifiers=['Framework :: Django',
+      classifiers=['Framework :: Django',
                    'Development Status :: 4 - Beta',
                    'Topic :: Internet',
                    'License :: OSI Approved :: BSD License',