[Python-modules-commits] r13394 - in packages/logilab-common/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Friday, June 11, 2010 @ 21:09:59
  Author: morph
Revision: 13394

* debian/patches/2c61959ae407
  - dropped, now merged in upstrem release

Modified:
  packages/logilab-common/trunk/debian/changelog
  packages/logilab-common/trunk/debian/patches/series
Deleted:
  packages/logilab-common/trunk/debian/patches/2c61959ae407

Modified: packages/logilab-common/trunk/debian/changelog
===================================================================
--- packages/logilab-common/trunk/debian/changelog	2010-06-11 19:22:42 UTC (rev 13393)
+++ packages/logilab-common/trunk/debian/changelog	2010-06-11 21:09:59 UTC (rev 13394)
@@ -1,8 +1,10 @@
 logilab-common (0.50.3-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/2c61959ae407
+    - dropped, now merged in upstrem release
 
- -- Sandro Tosi <morph at debian.org>  Fri, 11 Jun 2010 21:10:51 +0200
+ -- Sandro Tosi <morph at debian.org>  Fri, 11 Jun 2010 23:09:12 +0200
 
 logilab-common (0.50.2-1) unstable; urgency=low
 

Deleted: packages/logilab-common/trunk/debian/patches/2c61959ae407
===================================================================
--- packages/logilab-common/trunk/debian/patches/2c61959ae407	2010-06-11 19:22:42 UTC (rev 13393)
+++ packages/logilab-common/trunk/debian/patches/2c61959ae407	2010-06-11 21:09:59 UTC (rev 13394)
@@ -1,40 +0,0 @@
-
-# HG changeset patch
-# User Julien Jehannet <julien.jehannet at logilab.fr>
-# Date 1275038867 -7200
-# Node ID 2c61959ae407bf30ead9ce6aef06cb61ae079748
-# Parent  d347bb3985e4964940c2aaa6e91749d92316dbc4
-Fix nb_open_days() codomain: positive natural numbers are expected
-
-Return only positive natural numbers whatever the number of holiday days in computation.
-
-diff -r d347bb3985e4 -r 2c61959ae407 date.py
---- a/date.py	Fri May 28 10:26:27 2010 +0200
-+++ b/date.py	Fri May 28 11:27:47 2010 +0200
-@@ -166,7 +166,10 @@
-     open_days = weeks * 5 + plus
-     nb_week_holidays = len([x for x in get_national_holidays(start, end+step)
-                             if weekday(x) < 5 and x < end])
--    return open_days - nb_week_holidays
-+    open_days -= nb_week_holidays
-+    if open_days < 0:
-+        return 0
-+    return open_days
- 
- def date_range(begin, end, incday=None, incmonth=None):
-     """yields each date between begin and end
-diff -r d347bb3985e4 -r 2c61959ae407 test/unittest_date.py
---- a/test/unittest_date.py	Fri May 28 10:26:27 2010 +0200
-+++ b/test/unittest_date.py	Fri May 28 11:27:47 2010 +0200
-@@ -114,6 +114,10 @@
-         x = self.now()
-         self.assertOpenDays(x, x, 0)
- 
-+    def test_open_days_now_now2(self):
-+        x = self.datetimecls(2010, 5, 24)
-+        self.assertOpenDays(x, x, 0)
-+
-     def test_open_days_afternoon_before_holiday(self):
-         self.assertOpenDays(self.datetimecls(2008, 5, 7, 14), self.datetimecls(2008, 5, 8, 0), 1)
- 
-

Modified: packages/logilab-common/trunk/debian/patches/series
===================================================================
--- packages/logilab-common/trunk/debian/patches/series	2010-06-11 19:22:42 UTC (rev 13393)
+++ packages/logilab-common/trunk/debian/patches/series	2010-06-11 21:09:59 UTC (rev 13394)
@@ -1,2 +1 @@
 d347bb3985e4
-2c61959ae407