Simplify PPI_Geotag Time functions

scapy/contrib/ppi_geotag.uts

@@ -28,16 +28,22 @@ assert str(Antenna()) == b'5u\x08\x00\x02\x00\x08\x00\x00\x00\x00\x00'
 
 assert GPSTime_Field("GPSTime", None).delta == 0.0
 
+= Define local_to_utc
+
+def local_to_utc(local_time):
+    utc_time_clock = time.gmtime(time.mktime(local_time))
+    utc_time_clock = list(utc_time_clock.__reduce__()[1][0])
+    if local_time.tm_isdst:
+        utc_time_clock[3] = (utc_time_clock[3]+1)%24
+    return time.struct_time(tuple(utc_time_clock))
+
 = Test UTCTimeField with time values
 
 local_time = time.localtime()
 utc_time = UTCTimeField("Test", None, epoch=local_time)
 assert time.localtime(utc_time.epoch) == local_time
 assert time.mktime(time.gmtime(utc_time.delta)) == time.mktime(local_time)
-strft_time = time.strftime("%a, %d %b %Y %H:%M:%S +0000", local_time)
-if local_time.tm_isdst:
-    # Fix hour in case of summer time
-    strft_time = re.sub(r"(\d+)(:\d+:\d+)", (str(local_time.tm_hour - 1) + r"\2"), strft_time)
+strft_time = time.strftime("%a, %d %b %Y %H:%M:%S +0000", local_to_utc(local_time))
 
 assert utc_time.i2repr(None, None) == (strft_time + " (" + str(int(utc_time.delta)) + ")")
 
@@ -47,9 +53,6 @@ local_time = time.localtime()
 lme_time = LETimeField("Test", None, epoch=local_time)
 assert time.localtime(lme_time.epoch) == local_time
 assert time.mktime(time.gmtime(lme_time.delta)) == time.mktime(local_time)
-strft_time = time.strftime("%a, %d %b %Y %H:%M:%S +0000", local_time)
-if local_time.tm_isdst:
-    # Fix hour in case of summer time
-    strft_time = re.sub(r"(\d+)(:\d+:\d+)", (str(local_time.tm_hour - 1) + r"\2"), strft_time)
+strft_time = time.strftime("%a, %d %b %Y %H:%M:%S +0000", local_to_utc(local_time))
 
 assert lme_time.i2repr(None, None) == (strft_time + " (" + str(int(lme_time.delta)) + ")")