# HG changeset patch
# User Damien Correia
# Date 1528965666 -7200
# Node ID 1284a943f9799ed53fd4a5970cadb0fd96ae09f7
# Parent  6a4a802b91a355c16cd4126f4f30de643ed32e24# Parent  9313b3c435ebc429d1542bc2697ca789553622f9
merge default

diff -r 9313b3c435eb -r 1284a943f979 src/pyams_utils/__init__.py
--- a/src/pyams_utils/__init__.py	Thu Jun 14 08:58:27 2018 +0200
+++ b/src/pyams_utils/__init__.py	Thu Jun 14 10:41:06 2018 +0200
@@ -9,7 +9,10 @@
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
-
+"""
+PyAMS utilities
+===============
+"""
 __docformat__ = 'restructuredtext'
 
 
diff -r 9313b3c435eb -r 1284a943f979 src/pyams_utils/date.py
--- a/src/pyams_utils/date.py	Thu Jun 14 08:58:27 2018 +0200
+++ b/src/pyams_utils/date.py	Thu Jun 14 10:41:06 2018 +0200
@@ -28,10 +28,10 @@
 
 def unidate(value):
     """Get specified date converted to unicode ISO format
-    
+
     Dates are always assumed to be stored in GMT timezone
-    
-    :param date value: input date to convert to unicode
+
+    :param datetime value: input date to convert to unicode
     :return: unicode; input date converted to unicode
 
     >>> from datetime import datetime
@@ -48,9 +48,9 @@
 
 def parse_date(value):
     """Get date specified in unicode ISO format to Python datetime object
-    
+
     Dates are always assumed to be stored in GMT timezone
-    
+
     :param str value: unicode date to be parsed
     :return: datetime; the specified value, converted to datetime
 
@@ -65,7 +65,7 @@
 
 def date_to_datetime(value):
     """Get datetime value converted from a date or datetime object
-    
+
     :param date/datetime value: a date or datetime value to convert
     :return: datetime; input value converted to datetime