Blob Blame Raw
diff -Naur astrometry.net-0.75/util/EXIF.py astrometry.net-0.75.fixed/util/EXIF.py
--- astrometry.net-0.75/util/EXIF.py	2018-07-13 21:48:16.000000000 +0200
+++ astrometry.net-0.75.fixed/util/EXIF.py	2018-07-14 17:50:13.893638750 +0200
@@ -1180,7 +1180,7 @@
 # extract multibyte integer in Intel format (big endian)
 def s2n_intel(str):
     x = 0
-    y = 0L
+    y = 0
     for c in str:
         x = x | (ord(c) << y)
         y = y + 8
@@ -1261,7 +1261,7 @@
             val=s2n_motorola(slice)
         # Sign extension ?
         if signed:
-            msb=1L << (8*length-1)
+            msb=1 << (8*length-1)
             if val & msb:
                 val=val-(msb << 1)
         return val
@@ -1517,7 +1517,7 @@
             elif note.values[0:7] == [78, 105, 107, 111, 110, 0, 2]:
                 if self.debug:
                     print("Looks like a labeled type 2 Nikon MakerNote")
-                if note.values[12:14] != [0, 42] and note.values[12:14] != [42L, 0L]:
+                if note.values[12:14] != [0, 42] and note.values[12:14] != [42, 0]:
                     raise ValueError("Missing marker tag '42' in MakerNote.")
                 # skip the Makernote label and the TIFF header
                 self.dump_IFD(note.field_offset+10+8, 'MakerNote',