[python-coards] 04/06: merge patched into master

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-coards.

commit 9f40cf200c56ee36b9c768c5e8d24ab8f71cf8fc
Merge: 9c5218f ee7566c
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Dec 28 12:14:59 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0001-Use-print-function-in-docstrings.patch    | 62 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 src/coards/__init__.py                             | 22 ++++----
 4 files changed, 76 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index 0c526cd,0000000..a82eaaf
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- b447ed756a24013b9ccf678f9dffe80f419adb14
- b447ed756a24013b9ccf678f9dffe80f419adb14
++ee7566c6f5825658b55fc5b196d72b945841065f
++ee7566c6f5825658b55fc5b196d72b945841065f
 +b447ed756a24013b9ccf678f9dffe80f419adb14
 +b447ed756a24013b9ccf678f9dffe80f419adb14
 +python-coards_1.0.5.orig.tar.gz
 +56b9b9f74862761399d8c97b5a5632d82aabc47f
 +4658
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-print-function-in-docstrings.patch
index 0000000,0000000..7ad2bfc
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-print-function-in-docstrings.patch
@@@ -1,0 -1,0 +1,62 @@@
++From ee7566c6f5825658b55fc5b196d72b945841065f Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Wed, 28 Dec 2016 11:57:26 +0000
++Subject: Use print function in docstrings
++
++---
++ src/coards/__init__.py | 22 +++++++++++-----------
++ 1 file changed, 11 insertions(+), 11 deletions(-)
++
++diff --git a/src/coards/__init__.py b/src/coards/__init__.py
++index 52a52f6..069460e 100755
++--- a/src/coards/__init__.py
+++++ b/src/coards/__init__.py
++@@ -122,29 +122,29 @@ def format(date, units):
++     """
++     Convert a datetime object into a COARDS compliant date::
++ 
++-        >>> print format(datetime(1970, 1, 1, 0, 0), "hours since 1970-01-01 00:00:00")
+++        >>> print(format(datetime(1970, 1, 1, 0, 0), "hours since 1970-01-01 00:00:00"))
++         0.0
++-        >>> print format(datetime(1969, 12, 31, 21, 30), "hours since 1970-01-01 00:00:00 +2:30")
+++        >>> print(format(datetime(1969, 12, 31, 21, 30), "hours since 1970-01-01 00:00:00 +2:30"))
++         0.0
++-        >>> print format(datetime(1996, 1, 1, 10, 0), "hours since 1996-1-1") 
+++        >>> print(format(datetime(1996, 1, 1, 10, 0), "hours since 1996-1-1"))
++         10.0
++-        >>> print format(datetime(1, 1, 1, 10, 0), "hours since 1-1-1")
+++        >>> print(format(datetime(1, 1, 1, 10, 0), "hours since 1-1-1"))
++         10.0
++-        >>> print format(datetime(1990, 11, 25, 22, 0), "hours since 1990-11-25 12:00:00")
+++        >>> print(format(datetime(1990, 11, 25, 22, 0), "hours since 1990-11-25 12:00:00"))
++         10.0
++-        >>> print format(datetime(1990, 11, 25, 22, 0), "hours since 1990-11-25 12:00")
+++        >>> print(format(datetime(1990, 11, 25, 22, 0), "hours since 1990-11-25 12:00"))
++         10.0
++-        >>> print format(datetime(1990, 11, 25, 20, 0), "hours since 1990-11-25 12:00 +2:00")
+++        >>> print(format(datetime(1990, 11, 25, 20, 0), "hours since 1990-11-25 12:00 +2:00"))
++         10.0
++-        >>> print format(datetime(1990, 11, 25, 22, 0), "hours since 1990-11-25 12:00 UTC")
+++        >>> print(format(datetime(1990, 11, 25, 22, 0), "hours since 1990-11-25 12:00 UTC"))
++         10.0
++-        >>> print format(datetime(1970, 1, 1, 0, 0, 10), "seconds since 1970-1-1")
+++        >>> print(format(datetime(1970, 1, 1, 0, 0, 10), "seconds since 1970-1-1"))
++         10.0
++ 
++     It works with a year that never existed, since it's usual to have the
++     origin set to the year zero in climatological datasets::
++ 
++-        >>> print format(datetime(1, 1, 1, 0, 0), "days since 0000-01-01 00:00:00")
+++        >>> print(format(datetime(1, 1, 1, 0, 0), "days since 0000-01-01 00:00:00"))
++         366.0
++ 
++     """
++@@ -159,7 +159,7 @@ def parse_units(units):
++     This function transforms all Udunits defined time units, returning it
++     converted to seconds::
++ 
++-        >>> print parse_units("min")
+++        >>> print(parse_units("min"))
++         60.0
++ 
++     """
diff --cc debian/patches/series
index 0000000,0000000..87284d7
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-print-function-in-docstrings.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-coards.git