[Python-modules-commits] [python-exif] 10/19: more cleanup...
Wolfgang Borgert
debacle at moszumanska.debian.org
Mon Oct 6 22:18:38 UTC 2014
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to reference refs/remotes/upstream/develop
in repository python-exif.
commit 78200231440e2918324755626d54565c09f3c902
Author: ianaré sévi <ianare at gmail.com>
Date: Sat Dec 28 20:53:07 2013 +0100
more cleanup...
---
exifread/__init__.py | 10 ++++----
exifread/classes.py | 57 +++++++++++++++++++++++-----------------------
exifread/tags/makernote.py | 2 --
exifread/utils.py | 7 +++---
4 files changed, 37 insertions(+), 39 deletions(-)
diff --git a/exifread/__init__.py b/exifread/__init__.py
index 77863d9..6052eb5 100644
--- a/exifread/__init__.py
+++ b/exifread/__init__.py
@@ -189,7 +189,7 @@ def process_file(f, stop_tag=DEFAULT_STOP_TAG, details=True, strict=False, debug
}[endian])
hdr = ExifHeader(f, endian, offset, fake_exif, strict, debug, details)
- ifd_list = hdr.list_IFDs()
+ ifd_list = hdr.list_ifd()
thumb_ifd = False
ctr = 0
for ifd in ifd_list:
@@ -201,24 +201,24 @@ def process_file(f, stop_tag=DEFAULT_STOP_TAG, details=True, strict=False, debug
else:
ifd_name = 'IFD %d' % ctr
logger.debug('IFD %d (%s) at offset %d:', ctr, ifd_name, ifd)
- hdr.dump_IFD(ifd, ifd_name, stop_tag=stop_tag)
+ hdr.dump_ifd(ifd, ifd_name, stop_tag=stop_tag)
# EXIF IFD
exif_off = hdr.tags.get(ifd_name + ' ExifOffset')
if exif_off:
logger.debug(' Exif SubIFD at offset %d:', exif_off.values[0])
- hdr.dump_IFD(exif_off.values[0], 'EXIF', stop_tag=stop_tag)
+ hdr.dump_ifd(exif_off.values[0], 'EXIF', stop_tag=stop_tag)
# Interoperability IFD contained in EXIF IFD
intr_off = hdr.tags.get('EXIF SubIFD InteroperabilityOffset')
if intr_off:
logger.debug(' EXIF Interoperability SubSubIFD at offset %d:',
intr_off.values[0])
- hdr.dump_IFD(intr_off.values[0], 'EXIF Interoperability',
+ hdr.dump_ifd(intr_off.values[0], 'EXIF Interoperability',
tag_dict=INTR_TAGS, stop_tag=stop_tag)
# GPS IFD
gps_off = hdr.tags.get(ifd_name + ' GPSInfo')
if gps_off:
logger.debug(' GPS SubIFD at offset %d:', gps_off.values[0])
- hdr.dump_IFD(gps_off.values[0], 'GPS', tag_dict=GPS_TAGS, stop_tag=stop_tag)
+ hdr.dump_ifd(gps_off.values[0], 'GPS', tag_dict=GPS_TAGS, stop_tag=stop_tag)
ctr += 1
# deal with MakerNote contained in EXIF IFD
diff --git a/exifread/classes.py b/exifread/classes.py
index beff921..6c26d37 100644
--- a/exifread/classes.py
+++ b/exifread/classes.py
@@ -70,16 +70,16 @@ class ExifHeader:
to some other starting point.
"""
self.file.seek(self.offset + offset)
- slice = self.file.read(length)
+ sliced = self.file.read(length)
if self.endian == 'I':
- val = s2n_intel(slice)
+ val = s2n_intel(sliced)
else:
- val = s2n_motorola(slice)
+ val = s2n_motorola(sliced)
# Sign extension ?
if signed:
msb = 1 << (8 * length - 1)
if val & msb:
- val = val - (msb << 1)
+ val -= (msb << 1)
return val
def n2s(self, offset, length):
@@ -87,17 +87,17 @@ class ExifHeader:
s = ''
for dummy in range(length):
if self.endian == 'I':
- s = s + chr(offset & 0xFF)
+ s += chr(offset & 0xFF)
else:
s = chr(offset & 0xFF) + s
offset = offset >> 8
return s
- def first_IFD(self):
+ def _first_ifd(self):
"""Return first IFD."""
return self.s2n(4, 4)
- def next_IFD(self, ifd):
+ def _next_ifd(self, ifd):
"""Return the pointer to next IFD."""
entries = self.s2n(ifd, 2)
next_ifd = self.s2n(ifd + 2 + 12 * entries, 4)
@@ -106,16 +106,16 @@ class ExifHeader:
else:
return next_ifd
- def list_IFDs(self):
+ def list_ifd(self):
"""Return the list of IFDs in the header."""
- i = self.first_IFD()
+ i = self._first_ifd()
ifds = []
while i:
ifds.append(i)
- i = self.next_IFD(i)
+ i = self._next_ifd(i)
return ifds
- def dump_IFD(self, ifd, ifd_name, tag_dict=EXIF_TAGS, relative=0, stop_tag=DEFAULT_STOP_TAG):
+ def dump_ifd(self, ifd, ifd_name, tag_dict=EXIF_TAGS, relative=0, stop_tag=DEFAULT_STOP_TAG):
"""Return a list of entries in the given IFD."""
entries = self.s2n(ifd, 2)
for i in range(entries):
@@ -265,17 +265,17 @@ class ExifHeader:
entry = thumb_ifd + 2 + 12 * i
tag = self.s2n(entry, 2)
field_type = self.s2n(entry + 2, 2)
- typelen = FIELD_TYPES[field_type][0]
+ type_length = FIELD_TYPES[field_type][0]
count = self.s2n(entry + 4, 4)
- oldoff = self.s2n(entry + 8, 4)
+ old_offset = self.s2n(entry + 8, 4)
# start of the 4-byte pointer area in entry
ptr = i * 12 + 18
# remember strip offsets location
if tag == 0x0111:
strip_off = ptr
- strip_len = count * typelen
+ strip_len = count * type_length
# is it in the data area?
- if count * typelen > 4:
+ if count * type_length > 4:
# update offset pointer (nasty "strings are immutable" crap)
# should be able to say "tiff[ptr:ptr+4]=newoff"
newoff = len(tiff)
@@ -284,9 +284,9 @@ class ExifHeader:
if tag == 0x0111:
strip_off = newoff
strip_len = 4
- # get original data and store it
- self.file.seek(self.offset + oldoff)
- tiff += self.file.read(count * typelen)
+ # get original data and store it
+ self.file.seek(self.offset + old_offset)
+ tiff += self.file.read(count * type_length)
# add pixel strips and update strip offset info
old_offsets = self.tags['Thumbnail StripOffsets'].values
@@ -363,7 +363,7 @@ class ExifHeader:
if 'NIKON' in make:
if note.values[0:7] == [78, 105, 107, 111, 110, 0, 1]:
logger.debug("Looks like a type 1 Nikon MakerNote.")
- self.dump_IFD(note.field_offset + 8, 'MakerNote',
+ self.dump_ifd(note.field_offset + 8, 'MakerNote',
tag_dict=makernote.NIKON_OLD)
elif note.values[0:7] == [78, 105, 107, 111, 110, 0, 2]:
if self.debug:
@@ -371,18 +371,18 @@ class ExifHeader:
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',
+ self.dump_ifd(note.field_offset + 10 + 8, 'MakerNote',
tag_dict=makernote.NIKON_NEW, relative=1)
else:
# E99x or D1
logger.debug("Looks like an unlabeled type 2 Nikon MakerNote")
- self.dump_IFD(note.field_offset, 'MakerNote',
+ self.dump_ifd(note.field_offset, 'MakerNote',
tag_dict=makernote.NIKON_NEW)
return
# Olympus
if make.startswith('OLYMPUS'):
- self.dump_IFD(note.field_offset + 8, 'MakerNote',
+ self.dump_ifd(note.field_offset + 8, 'MakerNote',
tag_dict=makernote.OLYMPUS)
# TODO
#for i in (('MakerNote Tag 0x2020', makernote.OLYMPUS_TAG_0x2020),):
@@ -391,7 +391,7 @@ class ExifHeader:
# Casio
if 'CASIO' in make or 'Casio' in make:
- self.dump_IFD(note.field_offset, 'MakerNote',
+ self.dump_ifd(note.field_offset, 'MakerNote',
tag_dict=makernote.CASIO)
return
@@ -406,7 +406,7 @@ class ExifHeader:
offset = self.offset
self.offset += note.field_offset
# process note with bogus values (note is actually at offset 12)
- self.dump_IFD(12, 'MakerNote', tag_dict=makernote.FUJIFILM)
+ self.dump_ifd(12, 'MakerNote', tag_dict=makernote.FUJIFILM)
# reset to correct values
self.endian = endian
self.offset = offset
@@ -414,7 +414,7 @@ class ExifHeader:
# Canon
if make == 'Canon':
- self.dump_IFD(note.field_offset, 'MakerNote',
+ self.dump_ifd(note.field_offset, 'MakerNote',
tag_dict=makernote.canon.TAGS)
for i in (('MakerNote Tag 0x0001', makernote.canon.CAMERA_SETTINGS),
('MakerNote Tag 0x0002', makernote.canon.FOCAL_LENGTH),
@@ -460,15 +460,16 @@ class ExifHeader:
None, None)
def canon_decode_camera_info(self, camera_info_tag):
- """Decode the variable length encoded camera info section."""
+ """
+ Decode the variable length encoded camera info section.
+ """
model = self.tags.get('Image Model', None)
if not model:
return
model = str(model.values)
camera_info_tags = None
- for (model_name_re, tag_desc) in \
- makernote.canon.CAMERA_INFO_MODEL_MAP.items():
+ for (model_name_re, tag_desc) in makernote.canon.CAMERA_INFO_MODEL_MAP.items():
if re.search(model_name_re, model):
camera_info_tags = tag_desc
break
diff --git a/exifread/tags/makernote.py b/exifread/tags/makernote.py
index 7810359..0d9859b 100644
--- a/exifread/tags/makernote.py
+++ b/exifread/tags/makernote.py
@@ -681,5 +681,3 @@ FUJIFILM = {
1: 'On'
}),
}
-
-
diff --git a/exifread/utils.py b/exifread/utils.py
index 5f66cfb..d33949f 100644
--- a/exifread/utils.py
+++ b/exifread/utils.py
@@ -29,7 +29,6 @@ def make_string_uc(seq):
Special version to deal with the code in the first 8 bytes of a user comment.
First 8 bytes gives coding system e.g. ASCII vs. JIS vs Unicode.
"""
- #code = seq[0:8]
seq = seq[8:]
# Of course, this is only correct if ASCII, and the standard explicitly
# allows JIS and Unicode.
@@ -37,7 +36,7 @@ def make_string_uc(seq):
def s2n_motorola(str):
- """Extract multibyte integer in Motorola format (little endian)."""
+ """Extract multi-byte integer in Motorola format (little endian)."""
x = 0
for c in str:
x = (x << 8) | ord_(c)
@@ -45,12 +44,12 @@ def s2n_motorola(str):
def s2n_intel(str):
- """Extract multibyte integer in Intel format (big endian)."""
+ """Extract multi-byte integer in Intel format (big endian)."""
x = 0
y = 0
for c in str:
x = x | (ord_(c) << y)
- y = y + 8
+ y += + 8
return x
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-exif.git
More information about the Python-modules-commits
mailing list