Merge pull request #6 from cannatag/dev

Dev 0.9.7.2 to master

README.md

@@ -1,8 +1,8 @@
 LDAP3
 =====
 
-[![Build Status](https://travis-ci.org/cannatag/ldap3.svg?branch=master)](https://travis-ci.org/cannatag/ldap3)
-    
+[![Build Status](https://travis-ci.org/cannatag/ldap3.svg?branch=master)](https://travis-ci.org/cannatag/ldap3) 
+[![License](https://pypip.in/license/ldap3/badge.svg)](https://pypi.python.org/pypi/ldap3/)
 
 ldap3 is a strictly RFC 4511 conforming LDAP V3 pure Python client. The same codebase works with Python, Python 3, PyPy and PyPy3.
 
@@ -78,6 +78,10 @@ For information and suggestions you can contact me at cannatag@gmail.com or you
 
 CHANGELOG
 ---------
+
+* 0.9.7.2 2015.01.11
+    - Fixed a bug when resolving IP address with getaddrinfo(). On OSX returned an UDP connection.
+
 * 0.9.7.1 2015.01.05
     - Moved to Github
     - Moved to Travis-CI for continuous integration

README.rst

@@ -4,7 +4,9 @@ LDAP3
     :target: https://travis-ci.org/cannatag/ldap3
     :alt: TRAVIS-CI build status for master branch
 
-
+.. image:: https://pypip.in/license/ldap3/badge.svg
+    :target: https://pypi.python.org/pypi/ldap3/
+    :alt: License
 
 ldap3 is a strictly RFC 4511 conforming LDAP V3 pure Python client. The same codebase works with Python, Python 3, PyPy and PyPy3.
 
@@ -78,6 +80,9 @@ Contact me
 
 For information and suggestions you can contact me at cannatag@gmail.com or you can also a support ticket on https://github.com/cannatag/ldap3/issues/new
 
+* 0.9.7.2 2015.01.16
+    - Fixed a bug when resolving IP address with getaddrinfo(). On OSX returned an UDP connection.
+
 * 0.9.7.1 2015.01.05
     - Moved to Github
     - Moved to Travis-CI for continuous integration

_version.py

@@ -22,7 +22,7 @@
 
 __package_name__ = 'ldap3'
 __package_folder__ = '.'
-__version__ = '0.9.7.1'
+__version__ = '0.9.7.2'
 __author__ = 'Giovanni Cannata'
 __email__ = 'cannatag@gmail.com'
 __license__ = 'LGPL v3'

docs/manual/source/quicktour.rst

@@ -101,6 +101,13 @@ Using the context manager connections will be opened and bound as you enter the
 Unbind will be tried even if the operations in context raise an exception.
 
 
+Binding
+-------
+
+You can bind (authenticate) to the server with any of the authentication method defined in the LDAP v3 protocol: Anonymous, Simple and SASL.
+You can perform an automatic bind with the auto_bind=True parameter of the connection object or performing a bind() operation that returns a boolean to indicate if bind was succcesful.
+You can read the result of the bind operation in the 'result' attribute of the connection object. If auto_bind is not succesful the library will raise an LDAPBindError exception.
+
 Searching
 ---------
 

ldap3/core/server.py

@@ -177,9 +177,8 @@ def __repr__(self):
     def address_info(self):
         if not self._address_info or (datetime.now() - self._address_info_resolved_time).seconds > ADDRESS_INFO_REFRESH_TIME:
             # converts addresses tuple to list and adds a 6th parameter for availability (None = not checked, True = available, False=not available) and a 7th parameter for the checking time
-
             try:
-                self._address_info = [list(address) + [None, None] for address in socket.getaddrinfo(self.host, self.port, socket.AF_UNSPEC, socket.IPPROTO_IP)]
+                self._address_info = [list(address) + [None, None] for address in socket.getaddrinfo(self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM, socket.IPPROTO_TCP, 0)]
                 self._address_info_resolved_time = datetime.now()
             except Exception:
                 self._address_info = []

ldap3/version.py

@@ -1,9 +1,9 @@
 # version file for ldap3
-# autogenerated on 2015-01-08 17:50:33.043569
+# generated on 2015-01-16 06:03:33.053139
 # on system uname_result(system='Windows', node='GCNBHPW8', release='8', version='6.2.9200', machine='AMD64', processor='Intel64 Family 6 Model 58 Stepping 9, GenuineIntel')
-# with Python3.4.2 - ('v3.4.2:ab2c023a9432', 'Oct  6 2014 22:16:31') - MSC v.1600 64 bit (AMD64)
+# with Python 3.4.2 - ('v3.4.2:ab2c023a9432', 'Oct  6 2014 22:16:31') - MSC v.1600 64 bit (AMD64)
 #
-__version__ = '0.9.7.1'
+__version__ = '0.9.7.2'
 __author__ = 'Giovanni Cannata'
 __email__ = 'cannatag@gmail.com'
 __url__ = 'https://github.com/cannatag/ldap3'

setup.py

@@ -45,9 +45,9 @@
 project_version_file = open(path.join(__package_folder__, __package_name__, 'version.py'), 'w+')
 project_version_file.write('\n'.join([
     '# version file for ' + __package_name__,
-    '# autogenerated on ' + datetime.now().__str__(),
+    '# generated on ' + datetime.now().__str__(),
     '# on system ' + str(uname()),
-    '# with Python' + python_version() + ' - ' + str(python_build()) + ' - ' + python_compiler(),
+    '# with Python ' + python_version() + ' - ' + str(python_build()) + ' - ' + python_compiler(),
     '#',
     '__version__ = ' + "'" + __version__ + "'",
     '__author__ = ' + "'" + __author__ + "'",

test/testModifyDNOperation.py

@@ -62,7 +62,6 @@ def test_move_dn(self):
                 result = self.connection.result
             if result['description'] == 'other' and counter > 0:
                 counter -= 1
-                print(result)
                 if counter > 0:
                     sleep(2)
                     continue