diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-11-04 07:43:44 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-11-04 07:43:44 +0100 |
| commit | 72e886328c14c832b2ed71c400069b63852ee18d (patch) | |
| tree | 92b4f32df417af5cbb9433386d996ec7d17522e9 /gnu/packages/patches/python-pycrypto-time-clock.patch | |
| parent | 1c41971e721dde203580ec17899beae546f1133a (diff) | |
| parent | f54f36b363a86bb033275e3a0594974d3d91bd53 (diff) | |
Merge branch 'master' into gnome-team
Change-Id: I88d3789460d1a89917451d80405d89a2824006ac
Diffstat (limited to 'gnu/packages/patches/python-pycrypto-time-clock.patch')
| -rw-r--r-- | gnu/packages/patches/python-pycrypto-time-clock.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/gnu/packages/patches/python-pycrypto-time-clock.patch b/gnu/packages/patches/python-pycrypto-time-clock.patch deleted file mode 100644 index 9b7a8232a2..0000000000 --- a/gnu/packages/patches/python-pycrypto-time-clock.patch +++ /dev/null @@ -1,23 +0,0 @@ -Drop use of the deprecated time.clock which was removed in Python 3.8. - -Adapted from upstream pull request: - -https://github.com/dlitz/pycrypto/pull/296 - -diff --git a/lib/Crypto/Random/_UserFriendlyRNG.py b/lib/Crypto/Random/_UserFriendlyRNG.py ---- a/lib/Crypto/Random/_UserFriendlyRNG.py -+++ b/lib/Crypto/Random/_UserFriendlyRNG.py -@@ -73,8 +73,11 @@ class _EntropyCollector(object): - t = time.time() - self._time_es.feed(struct.pack("@I", int(2**30 * (t - floor(t))))) - -- # Add the fractional part of time.clock() -- t = time.clock() -+ # Add the fractional part of time.process_time() -+ try: -+ t = time.process_time() -+ except AttributeError: -+ t = time.clock() - self._clock_es.feed(struct.pack("@I", int(2**30 * (t - floor(t))))) - - |