Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base: 175ec3afbc
...
compare: 38c6e731a0
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 5 additions and 5 deletions.
  1. +1 −1  README.rst
  2. +4 −4 docs/index.rst
View
2  README.rst
@@ -8,7 +8,7 @@ replacing it with a dependency on ``python3-ldap``, which is a pure
Python package that also supports Python 3.
See the documentation at
-http://docs.pylonsproject.org/projects/pyramid_ldap3/en/latest/ for more
+http://docs.pylonsproject.org/projects/pyramid_ldap/en/latest/ for more
information.
This package will only work with Pyramid 1.3 and later.
View
8 docs/index.rst
@@ -53,7 +53,7 @@ attempts to talk to an Active Directory server:
.. code-block:: python
- import ldap
+ import ldap3
config = Configurator()
@@ -68,13 +68,13 @@ attempts to talk to an Active Directory server:
config.ldap_set_login_query(
base_dn='CN=Users,DC=example,DC=com',
filter_tmpl='(sAMAccountName=%(login)s)',
- scope = ldap.SCOPE_ONELEVEL,
+ scope = ldap3.SEARCH_SCOPE_SINGLE_LEVEL,
)
config.ldap_set_groups_query(
base_dn='CN=Users,DC=example,DC=com',
filter_tmpl='(&(objectCategory=group)(member=%(userdn)s))',
- scope = ldap.SCOPE_SUBTREE,
+ scope = ldap3.SEARCH_SCOPE_WHOLE_SUBTREE,
cache_period = 600,
)
@@ -177,7 +177,7 @@ Here's a small application which uses the ``pyramid_ldap3`` API:
return HTTPFound('/', headers=headers)
else:
error = 'Invalid credentials'
-
+
return dict(
login_url=url,
login=login,

No commit comments for this range

Something went wrong with that request. Please try again.