Merge branch 'Davidrums-master'

rickypc · Sep 17, 2016 · d5df638 · d5df638
2 parents 2885ef1 + c52c3a3
commit d5df638
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,8 @@
+0.2.4 (2016.09.17)
+==================
+
+* Fix is_secure parameter. Thanks to @davidrums
+
 0.2.3 (2016.01.19)
 ==================
 

diff --git a/README.rst b/README.rst
@@ -163,7 +163,7 @@ ImapLibrary must be imported into your Robot test suite.
 .. code:: robotframework
 
     *** Settings ***
-    Library  ImapLibrary
+    Library    ImapLibrary
 
 See `Robot Framework User Guide`_ for more information.
 

diff --git a/doc/ImapLibrary.html b/doc/ImapLibrary.html
diff --git a/setup.py b/setup.py
@@ -44,11 +44,12 @@
     license='Apache License, Version 2.0',
     classifiers=[
         'Development Status :: 4 - Beta',
+        'Framework :: Robot Framework',
         'Intended Audience :: Developers',
-        'Topic :: Software Development :: Testing',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
+        'Topic :: Software Development :: Testing',
     ],
     keywords='robot framework testing automation imap email mail softwaretesting',
     platforms='any',

diff --git a/src/ImapLibrary/__init__.py b/src/ImapLibrary/__init__.py
@@ -275,7 +275,7 @@ def open_mailbox(self, **kwargs):
         | Open Mailbox | host=HOST | user=USER | password=SECRET | port=8000 |
         """
         host = kwargs.pop('host', kwargs.pop('server', None))
-        is_secure = kwargs.pop('is_secure', True)
+        is_secure = kwargs.pop('is_secure', 'True') == 'True'
         port = int(kwargs.pop('port', self.PORT_SECURE if is_secure else self.PORT))
         self._imap = IMAP4_SSL(host, port) if is_secure else IMAP4(host, port)
         self._imap.login(kwargs.pop('user', None), kwargs.pop('password', None))

diff --git a/src/ImapLibrary/version.py b/src/ImapLibrary/version.py
@@ -19,7 +19,7 @@
 IMAP Library - a IMAP email testing library.
 """
 
-VERSION = '0.2.3'
+VERSION = '0.2.4'
 
 
 def get_version():