Skip to content

Merge pyldap + python-ldap #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 123 commits into from
Nov 24, 2017
Merged

Merge pyldap + python-ldap #4

merged 123 commits into from
Nov 24, 2017

Conversation

encukou
Copy link
Member

@encukou encukou commented Nov 24, 2017

This merges Michael's 2.5.x branch from CVS, and the pyldap project.

The result should be the same as in pyldap/pyldap#142, except there's no deprecation note in the README.
edit: And the CHANGELOG is different

stroeder added 30 commits November 7, 2017 21:08
…rom new sub-module ldap.pkginfo also to setup.py
  VLVResponseControl.decodeControlValue() now follow the coding
  convention to use camel-cased ASN.1 name as class attribute name.
  The old class names are still set for back-ward compability
  but should not be used in new code because they might be removed
  in a later release.
* removed SSSRequestControl from ldap.controls.KNOWN_RESPONSE_CONTROLS
pyldap contributors and others added 22 commits November 24, 2017 11:46
Note that for backwards compatibility, cidict keeps the
has_key method even on Python 3.
The symlink is intended for tools that automatically pretty-print the file.
This should eventually be moved elsewhere in the docs.
- DNs, attribute names, URLs are text (encoded to UTF-8 on the wire)
- Attribute values are always bytes

A "bytes_mode" switch controls behavior under Python 2.
- Add 3.3 - 3.6 to tox.ini
- Add .travis.yml for Travis CI
- Add 3.3 - 3.6 to Trove classifiers
- Add Python version checking to setup.py
The changes are squashed, so we don't have line-by-line authorship
in Git. List people here instead, and link to the history.
@encukou
Copy link
Member Author

encukou commented Nov 24, 2017

cc @tiran

@tiran
Copy link
Member

tiran commented Nov 24, 2017

Confirmed, only CHANGES and README are different.

pushd pyldap
git pr 142
git clean -xdf
popd
pushd python-ldap
git pr 4
git clean -xdf
popd
diff -ur -x.git python-ldap pyldap

@encukou encukou mentioned this pull request Nov 24, 2017
21 tasks
@encukou
Copy link
Member Author

encukou commented Nov 24, 2017

Known issue: README formatting is wrong, but let's fix it up after committing this.

@tiran
Copy link
Member

tiran commented Nov 24, 2017

tox tests are passing on my machine

@encukou encukou merged commit 4c9c526 into master Nov 24, 2017
@encukou encukou deleted the merge-pyldap branch November 24, 2017 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants