Blame SOURCES/0002-unbundle-ordereddict.patch
|
 |
cd51cd |
diff -ru ldap3-2.8.orig/ldap3/abstract/entry.py ldap3-2.8.1/ldap3/abstract/entry.py
|
|
|
cd51cd |
--- ldap3-2.8.orig/ldap3/abstract/entry.py 2020-08-07 08:20:49.000000000 -0400
|
|
|
cd51cd |
+++ ldap3-2.8.1/ldap3/abstract/entry.py 2020-09-15 21:55:08.176426341 -0400
|
|
|
cd51cd |
@@ -28,7 +28,7 @@
|
|
|
cd51cd |
try:
|
|
|
cd51cd |
from collections import OrderedDict
|
|
|
cd51cd |
except ImportError:
|
|
|
cd51cd |
- from ..utils.ordDict import OrderedDict # for Python 2.6
|
|
|
cd51cd |
+ from ordereddict import OrderedDict # for Python 2.6
|
|
|
cd51cd |
|
|
|
cd51cd |
from os import linesep
|
|
|
cd51cd |
from copy import deepcopy
|
|
|
cd51cd |
diff -ru ldap3-2.6.1-orig/setup.py ldap3-2.6.1/setup.py
|
|
|
cd51cd |
--- ldap3-2.6.1-orig/setup.py 2018-07-21 00:32:31.000000000 -0400
|
|
|
cd51cd |
+++ ldap3-2.6.1/setup.py 2019-10-08 09:43:19.775209988 -0400
|
|
|
cd51cd |
@@ -23,6 +23,7 @@
|
|
|
cd51cd |
# If not, see <http://www.gnu.org/licenses/>.
|
|
|
cd51cd |
|
|
|
cd51cd |
import os
|
|
|
cd51cd |
+import sys
|
|
|
cd51cd |
import glob
|
|
|
cd51cd |
import shutil
|
|
|
cd51cd |
from json import load
|
|
|
cd51cd |
@@ -80,11 +81,13 @@
|
|
|
cd51cd |
|
|
|
cd51cd |
|
|
|
cd51cd |
setup_kwargs['cmdclass'] = {'clean': Clean}
|
|
|
cd51cd |
-
|
|
|
cd51cd |
+install_requires = [i.strip() for i in open('requirements.txt').readlines()]
|
|
|
cd51cd |
+if sys.version_info < (2, 7):
|
|
|
cd51cd |
+ install_requires.append('ordereddict')
|
|
|
cd51cd |
|
|
|
cd51cd |
setup(name=package_name,
|
|
|
cd51cd |
version=version,
|
|
|
cd51cd |
- install_requires=[i.strip() for i in open('requirements.txt').readlines()],
|
|
|
cd51cd |
+ install_requires=install_requires,
|
|
|
cd51cd |
license=license,
|
|
|
cd51cd |
author=author,
|
|
|
cd51cd |
author_email=email,
|