merged from the debian-sid tree

1 files changed, 5 insertions, 3 deletions

diff --git a/apt/utils.py b/apt/utils.py
index 4b3da39f..08140258 100644
--- a/apt/utils.py
+++ b/apt/utils.py
@@ -28,11 +28,13 @@ def get_maintenance_end_date(release_date, m_months):
     ends. Needs the data of the release and the number of months that
     its is supported as input
     """
-    years = m_months / 12
+    # calc end date
+    years = m_months // 12
     months = m_months % 12
     support_end_year = (release_date.year + years +
-                        (release_date.month + months)/12)
+                        (release_date.month + months)//12)
     support_end_month = (release_date.month + months) % 12
+    # special case: this happens when e.g. doing 2010-06 + 18 months
     if support_end_month == 0:
         support_end_month = 12
         support_end_year -= 1
@@ -46,7 +48,7 @@ def get_release_date_from_release_file(path):
     if not path or not os.path.exists(path):
         return None
     tag = apt_pkg.TagFile(open(path))
-    section = tag.next()
+    section = next(tag)
     if not "Date" in section:
         return None
     date = section["Date"]