diff -Nru python-monotonic-1.1/debian/changelog python-monotonic-1.5/debian/changelog --- python-monotonic-1.1/debian/changelog 2016-10-04 11:35:59.000000000 +0000 +++ python-monotonic-1.5/debian/changelog 2018-11-19 17:19:36.000000000 +0000 @@ -1,3 +1,15 @@ +python-monotonic (1.5-0ubuntu1~cloud0) bionic-stein; urgency=medium + + * New update for the Ubuntu Cloud Archive. + + -- Openstack Ubuntu Testing Bot Mon, 19 Nov 2018 17:19:36 +0000 + +python-monotonic (1.5-0ubuntu1) disco; urgency=medium + + * New upstream release + + -- James Page Wed, 14 Nov 2018 15:34:00 +0000 + python-monotonic (1.1-2) unstable; urgency=medium [ Ondřej Nový ] diff -Nru python-monotonic-1.1/debian/control python-monotonic-1.5/debian/control --- python-monotonic-1.1/debian/control 2016-10-04 11:35:59.000000000 +0000 +++ python-monotonic-1.5/debian/control 2018-11-14 11:36:28.000000000 +0000 @@ -1,7 +1,8 @@ Source: python-monotonic Section: python Priority: optional -Maintainer: PKG OpenStack +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: PKG OpenStack Uploaders: Thomas Goirand , Build-Depends: debhelper (>= 9), dh-python, diff -Nru python-monotonic-1.1/monotonic.py python-monotonic-1.5/monotonic.py --- python-monotonic-1.1/monotonic.py 2016-04-25 21:12:31.000000000 +0000 +++ python-monotonic-1.5/monotonic.py 2018-05-03 20:52:31.000000000 +0000 @@ -38,11 +38,6 @@ limitations under the License. """ -import ctypes -import ctypes.util -import os -import sys -import threading import time @@ -52,6 +47,11 @@ try: monotonic = time.monotonic except AttributeError: + import ctypes + import ctypes.util + import os + import sys + import threading try: if sys.platform == 'darwin': # OS X, iOS # See Technical Q&A QA1398 of the Mac Developer Library: @@ -89,7 +89,10 @@ # 2. libffi masks the problem because after making the call it doesn't # touch anything through esp and epilogue code restores a correct # esp from ebp afterwards. - kernel32 = ctypes.cdll.kernel32 + try: + kernel32 = ctypes.cdll.kernel32 + except OSError: # 'No such file or directory' + kernel32 = ctypes.cdll.LoadLibrary('kernel32.dll') else: kernel32 = ctypes.windll.kernel32 @@ -130,7 +133,7 @@ try: clock_gettime = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True).clock_gettime - except AttributeError: + except Exception: clock_gettime = ctypes.CDLL(ctypes.util.find_library('rt'), use_errno=True).clock_gettime @@ -147,6 +150,8 @@ CLOCK_MONOTONIC = 4 elif 'bsd' in sys.platform: CLOCK_MONOTONIC = 3 + elif sys.platform.startswith('aix'): + CLOCK_MONOTONIC = ctypes.c_longlong(10) def monotonic(): """Monotonic clock, cannot go backward.""" @@ -160,5 +165,5 @@ if monotonic() - monotonic() > 0: raise ValueError('monotonic() is not monotonic!') - except Exception: - raise RuntimeError('no suitable implementation for this system') + except Exception as e: + raise RuntimeError('no suitable implementation for this system: ' + repr(e)) diff -Nru python-monotonic-1.1/README.md python-monotonic-1.5/README.md --- python-monotonic-1.1/README.md 2016-04-25 21:12:31.000000000 +0000 +++ python-monotonic-1.5/README.md 2018-05-03 20:52:31.000000000 +0000 @@ -8,11 +8,11 @@ [``time.monotonic``][0] from the standard library. On older versions, it will fall back to an equivalent implementation: - OS | Implementation --------------|----------------------------------------- - Linux, *BSD | [clock_gettime][1] - Windows | [GetTickCount][2] or [GetTickCount64][3] - OS X | [mach_absolute_time][3] + OS | Implementation +-----------------|----------------------------------------- + Linux, BSD, AIX | [clock_gettime][1] + Windows | [GetTickCount][2] or [GetTickCount64][3] + OS X | [mach_absolute_time][3] If no suitable implementation exists for the current platform, attempting to import this module (or to import from it) will @@ -23,7 +23,7 @@ License ------- -Copyright 2014, 2015, 2016 Ori Livneh +Copyright 2014, 2015, 2016, 2017 Ori Livneh Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff -Nru python-monotonic-1.1/setup.py python-monotonic-1.5/setup.py --- python-monotonic-1.1/setup.py 2016-04-25 21:12:31.000000000 +0000 +++ python-monotonic-1.5/setup.py 2018-05-03 20:52:31.000000000 +0000 @@ -10,13 +10,13 @@ ``time.monotonic`` from the standard library. On older versions, it will fall back to an equivalent implementation: -+-------------+----------------------------------------+ -| Linux, BSD | ``clock_gettime(3)`` | -+-------------+----------------------------------------+ -| Windows | ``GetTickCount`` or ``GetTickCount64`` | -+-------------+----------------------------------------+ -| OS X | ``mach_absolute_time`` | -+-------------+----------------------------------------+ ++------------------+----------------------------------------+ +| Linux, BSD, AIX | ``clock_gettime(3)`` | ++------------------+----------------------------------------+ +| Windows | ``GetTickCount`` or ``GetTickCount64`` | ++------------------+----------------------------------------+ +| OS X | ``mach_absolute_time`` | ++------------------+----------------------------------------+ If no suitable implementation exists for the current platform, attempting to import this module (or to import from it) will @@ -31,7 +31,7 @@ setup( name='monotonic', - version='1.0', + version='1.5', license='Apache', author='Ori Livneh', author_email='ori@wikimedia.org',