From 489c61a22da0baa00d463f9780144befd68c2903 Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Sun, 10 Mar 2019 05:03:24 +0100
Subject: [PATCH 1/2] Allow tests to pass after 2038

without this change, the python-apache-libcloud tests failed
in the year 2039 with

     fp.write(struct.pack("<ll", mtime, size))
 E   error: 'l' format requires -2147483648 <= number <= 2147483647
---
 changelog/4903.bugfix.rst        | 1 +
 src/_pytest/assertion/rewrite.py | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 changelog/4903.bugfix.rst

diff --git a/changelog/4903.bugfix.rst b/changelog/4903.bugfix.rst
new file mode 100644
index 000000000..1e80fecbf
--- /dev/null
+++ b/changelog/4903.bugfix.rst
@@ -0,0 +1 @@
+Fix handling of mtime to work after year 2038
diff --git a/src/_pytest/assertion/rewrite.py b/src/_pytest/assertion/rewrite.py
index 301bdedc5..3b53fd395 100644
--- a/src/_pytest/assertion/rewrite.py
+++ b/src/_pytest/assertion/rewrite.py
@@ -344,9 +344,9 @@ def _write_pyc(state, co, source_stat, pyc):
     try:
         with atomicwrites.atomic_write(pyc, mode="wb", overwrite=True) as fp:
             fp.write(imp.get_magic())
-            mtime = int(source_stat.mtime)
+            mtime = int(source_stat.mtime) & 0xFFFFFFFF
             size = source_stat.size & 0xFFFFFFFF
-            fp.write(struct.pack("<ll", mtime, size))
+            fp.write(struct.pack("<LL", mtime, size))
             fp.write(marshal.dumps(co))
     except EnvironmentError as e:
         state.trace("error writing pyc file at %s: errno=%s" % (pyc, e.errno))
@@ -441,7 +441,7 @@ def _read_pyc(source, pyc, trace=lambda x: None):
         if (
             len(data) != 12
             or data[:4] != imp.get_magic()
-            or struct.unpack("<ll", data[4:]) != (mtime, size)
+            or struct.unpack("<LL", data[4:]) != (mtime & 0xFFFFFFFF, size & 0xFFFFFFFF)
         ):
             trace("_read_pyc(%s): invalid or out of date pyc" % source)
             return None

From 44cb51010c928948d7b6bff1713f1eb6c6f349a2 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Wed, 13 Mar 2019 18:52:30 -0300
Subject: [PATCH 2/2] Improve CHANGELOG and code comment

---
 changelog/4903.bugfix.rst        | 2 +-
 src/_pytest/assertion/rewrite.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog/4903.bugfix.rst b/changelog/4903.bugfix.rst
index 1e80fecbf..116e1b0fd 100644
--- a/changelog/4903.bugfix.rst
+++ b/changelog/4903.bugfix.rst
@@ -1 +1 @@
-Fix handling of mtime to work after year 2038
+Use the correct modified time for years after 2038 in rewritten ``.pyc`` files.
diff --git a/src/_pytest/assertion/rewrite.py b/src/_pytest/assertion/rewrite.py
index 3b53fd395..04ecbce5f 100644
--- a/src/_pytest/assertion/rewrite.py
+++ b/src/_pytest/assertion/rewrite.py
@@ -344,8 +344,10 @@ def _write_pyc(state, co, source_stat, pyc):
     try:
         with atomicwrites.atomic_write(pyc, mode="wb", overwrite=True) as fp:
             fp.write(imp.get_magic())
+            # as of now, bytecode header expects 32-bit numbers for size and mtime (#4903)
             mtime = int(source_stat.mtime) & 0xFFFFFFFF
             size = source_stat.size & 0xFFFFFFFF
+            # "<LL" stands for 2 unsigned longs, little-ending
             fp.write(struct.pack("<LL", mtime, size))
             fp.write(marshal.dumps(co))
     except EnvironmentError as e: