[Python-modules-commits] [python-exif] 06/19: Merge branch 'master' of https://github.com/velis74/exif-py into develop

[Wolfgang Borgert]

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 98f59088d15873c15ca5a529e1fea0f3317b57ee
Merge: 6ff9ed1 78a5ba8
Author: ianaré sévi <ianare at gmail.com>
Date:   Sat Dec 28 17:09:00 2013 +0100

    Merge branch 'master' of https://github.com/velis74/exif-py into develop
    
    Conflicts:
    	exifread/tags/__init__.py
    	exifread/tags/makernote.py

 exifread/__init__.py       | 82 ++++++++++++++++++++++++----------------------
 exifread/classes.py        |  4 ++-
 exifread/tags/makernote.py |  1 -
 exifread/utils.py          | 11 +++++--
 setup.py                   |  2 +-
 5 files changed, 54 insertions(+), 46 deletions(-)

diff --cc exifread/__init__.py
index 5ea08fe,d392867..972ceb1
--- a/exifread/__init__.py
+++ b/exifread/__init__.py
@@@ -1,16 -1,16 +1,17 @@@
  import logging
  from .classes import *
  from .tags import *
+ from .utils import ord_
  
 -__version__ = '1.4.1'
 +__version__ = '1.4.2'
  
  logger = logging.getLogger('exifread')
  
  
  def increment_base(data, base):
-     return ord(data[base+2]) * 256 + ord(data[base+3]) + 2
+     return ord_(data[base+2]) * 256 + ord_(data[base+3]) + 2
  
 +
  def process_file(f, stop_tag=DEFAULT_STOP_TAG, details=True, strict=False, debug=False):
      """
      Process an image file (expects an open file object).
diff --cc exifread/tags/makernote.py
index 7e3e143,d432237..a725407
--- a/exifread/tags/makernote.py
+++ b/exifread/tags/makernote.py
@@@ -3,10 -3,9 +3,9 @@@ Makernote tag definitions
  """
  
  from exifread.utils import make_string, make_string_uc, Ratio
--
  from . import makernote_canon as canon
  
 +
  def nikon_ev_bias(seq):
      """
      First digit seems to be in steps of 1/6 EV.
diff --cc exifread/utils.py
index 29c2f3f,0b09aa2..979f14c
--- a/exifread/utils.py
+++ b/exifread/utils.py
@@@ -1,7 -1,10 +1,12 @@@
 -
 +"""
 +Misc utilities.
 +"""
  
+ def ord_(dta):
+     if isinstance(dta, str):
+         return ord(dta)
+     return dta
+ 
  def make_string(seq):
      """
      Don't throw an exception when given an out of range character.
diff --cc setup.py
index 87fa012,87fa012..384e1ff
--- a/setup.py
+++ b/setup.py
@@@ -25,9 -25,9 +25,9 @@@ setup
          "Intended Audience :: End Users/Desktop",
          "License :: OSI Approved :: BSD License",
          "Operating System :: OS Independent",
--        "Programming Language :: Python :: 2.5",
          "Programming Language :: Python :: 2.6",
          "Programming Language :: Python :: 2.7",
++        "Programming Language :: Python :: 3",
          "Topic :: Utilities",
      ],
  )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-exif.git