Commits

Martin von Löwis  committed e11ec4b

Extend list of AX attributes.
Restore sphinx commands.

  • Participants
  • Parent commits b02f33e

Comments (0)

Files changed (3)

File doc/index.rst

 for specifying required and "if available" attributes for
 request_authentication.
 
-====== ======================================
-Name   URL
-====== ======================================
-email  http://axschema.org/contact/email
-first  http://axschema.org/namePerson/first
-last   http://axschema.org/namePerson/last
-====== ======================================
+========  ============================================
+Name      URL
+========  ============================================
+nickname  http://axschema.org/namePerson/friendly
+email     http://axschema.org/contact/email
+fullname  http://axschema.org/namePerson
+dob       http://axschema.org/birthDate
+gender    http://axschema.org/person/gender
+postcode  http://axschema.org/contact/postalCode/home
+country   http://axschema.org/contact/country/home
+language  http://axschema.org/pref/language
+timezone  http://axschema.org/pref/timezone
+first     http://axschema.org/namePerson/first
+last      http://axschema.org/namePerson/last
+========  ============================================
+
 
 Indices and tables
 ==================

File openid2rp.py

             return 'a%d' % (hash(value) % 1000000000)
 
 AX = _AX()
-AX.email = 'http://axschema.org/contact/email'
-AX.first = "http://axschema.org/namePerson/first"
-AX.last = "http://axschema.org/namePerson/last"
+AX.nickname  = "http://axschema.org/namePerson/friendly"
+AX.email     = "http://axschema.org/contact/email"
+AX.fullname  = "http://axschema.org/namePerson"
+AX.dob       = "http://axschema.org/birthDate"
+AX.gender    = "http://axschema.org/person/gender"
+AX.postcode  = "http://axschema.org/contact/postalCode/home"
+AX.country   = "http://axschema.org/contact/country/home"
+AX.language  = "http://axschema.org/pref/language"
+AX.timezone  = "http://axschema.org/pref/timezone"
+AX.first     = "http://axschema.org/namePerson/first"
+AX.last      = "http://axschema.org/namePerson/last"
 
 def request_authentication(services, url, assoc_handle, return_to,
                            claimed=None, op_local=None, realm=None,
 # -*- coding: utf-8 -*-
 from distutils.core import setup
+cmdclass = {}
 try:
-    from distutils.command.build_py import build_py_2to3 as build_py
+    from distutils.command.build_py import build_py_2to3
+    cmdclass['build_py'] = build_py_2to3
 except ImportError:
-    from distutils.command.build_py import build_py
+    pass
+try:
+    from sphinx.setup_command import BuildDoc
+    cmdclass['build_sphinx'] = BuildDoc
+except ImportError:
+    pass
+try:
+    # Use local copy of upload_docs, to avoid importing setuptools
+    from upload_docs import upload_docs
+    cmdclass['upload_docs'] = upload_docs
+except ImportError:
+    pass
 
 version='1.2'
 setup(name='openid2rp',
         "Programming Language :: Python :: 3.2",
         ],
       py_modules=['openid2rp'],
-      cmdclass = {'build_py': build_py},
+      cmdclass = cmdclass
       )