Merge pull request #80 from vadmium/py2.6

Remove workarounds for pre-2.6 Python

Author: cjw296

scripts/runxlrd.py

@@ -89,9 +89,8 @@ def get_row_data(bk, sh, rowx, colrange):
             if cty == xlrd.XL_CELL_DATE:
                 try:
                     showval = xlrd.xldate_as_tuple(cval, dmode)
-                except xlrd.XLDateError:
-                    e1, e2 = sys.exc_info()[:2]
-                    showval = "%s:%s" % (e1.__name__, e2)
+                except xlrd.XLDateError as e:
+                    showval = "%s:%s" % (type(e).__name__, e)
                     cty = xlrd.XL_CELL_ERROR
             elif cty == xlrd.XL_CELL_ERROR:
                 showval = xlrd.error_text_from_code.get(cval, '<Unknown error code 0x%02x>' % cval)
@@ -335,17 +334,15 @@ def main(cmd_args):
                     t1 = time.time()
                     if not options.suppress_timing:
                         print("Open took %.2f seconds" % (t1-t0,))
-                except xlrd.XLRDError:
-                    e0, e1 = sys.exc_info()[:2]
-                    print("*** Open failed: %s: %s" % (e0.__name__, e1))
+                except xlrd.XLRDError as e:
+                    print("*** Open failed: %s: %s" % (type(e).__name__, e))
                     continue
                 except KeyboardInterrupt:
                     print("*** KeyboardInterrupt ***")
                     traceback.print_exc(file=sys.stdout)
                     sys.exit(1)
-                except:
-                    e0, e1 = sys.exc_info()[:2]
-                    print("*** Open failed: %s: %s" % (e0.__name__, e1))
+                except BaseException as e:
+                    print("*** Open failed: %s: %s" % (type(e).__name__, e))
                     traceback.print_exc(file=sys.stdout)
                     continue
                 t0 = time.time()

xlrd/book.py

@@ -452,22 +452,20 @@ def sheet_names(self):
     # @return true if sheet is loaded, false otherwise
     # <br />  -- New in version 0.7.1
     def sheet_loaded(self, sheet_name_or_index):
-        # using type(1) because int won't work with Python 2.1
-        if isinstance(sheet_name_or_index, type(1)):
+        if isinstance(sheet_name_or_index, int):
             sheetx = sheet_name_or_index
         else:
             try:
                 sheetx = self._sheet_names.index(sheet_name_or_index)
             except ValueError:
                 raise XLRDError('No sheet named <%r>' % sheet_name_or_index)
-        return self._sheet_list[sheetx] and True or False # Python 2.1 again
+        return bool(self._sheet_list[sheetx])
 
     ##
     # @param sheet_name_or_index Name or index of sheet to be unloaded.
     # <br />  -- New in version 0.7.1
     def unload_sheet(self, sheet_name_or_index):
-        # using type(1) because int won't work with Python 2.1
-        if isinstance(sheet_name_or_index, type(1)):
+        if isinstance(sheet_name_or_index, int):
             sheetx = sheet_name_or_index
         else:
             try:
@@ -566,43 +564,18 @@ def biff2_8_load(self, filename=None, file_contents=None,
         self.ragged_rows = ragged_rows
 
         if not file_contents:
-            if python_version < (2, 2) and self.use_mmap:
-                # need to open for update
-                open_mode = "r+b"
-            else:
-                open_mode = "rb"
-            retry = False
-            f = None
-            try:
-                try:
-                    f = open(filename, open_mode)
-                except IOError:
-                    e, v = sys.exc_info()[:2]
-                    if open_mode == "r+b" \
-                    and (v.errno == 13 or v.strerror == "Permission denied"):
-                        # Maybe the file is read-only
-                        retry = True
-                        self.use_mmap = False
-                    else:
-                        raise
-                if retry:
-                    f = open(filename, "rb")
+            with open(filename, "rb") as f:
                 f.seek(0, 2) # EOF
                 size = f.tell()
                 f.seek(0, 0) # BOF
                 if size == 0:
                     raise XLRDError("File size is 0 bytes")
                 if self.use_mmap:
-                    if python_version < (2, 2):
-                        self.filestr = mmap.mmap(f.fileno(), size)
-                    else:
-                        self.filestr = mmap.mmap(f.fileno(), size, access=mmap.ACCESS_READ)
+                    self.filestr = mmap.mmap(f.fileno(), size, access=mmap.ACCESS_READ)
                     self.stream_len = size
                 else:
                     self.filestr = f.read()
                     self.stream_len = len(self.filestr)
-            finally:
-                if f: f.close()
         else:
             self.filestr = file_contents
             self.stream_len = len(file_contents)
@@ -800,11 +773,10 @@ def derive_encoding(self):
             # we're well & truly stuffed -- let the punter know ASAP.
             try:
                 _unused = unicode(b'trial', self.encoding)
-            except:
-                ei = sys.exc_info()[:2]
+            except BaseException as e:
                 fprintf(self.logfile,
                     "ERROR *** codepage %r -> encoding %r -> %s: %s\n",
-                    self.codepage, self.encoding, ei[0].__name__.split(".")[-1], ei[1])
+                    self.codepage, self.encoding, type(e).__name__.split(".")[-1], e)
                 raise
         if self.raw_user_name:
             strg = unpack_string(self.user_name, 0, self.encoding, lenlen=1)

xlrd/compdoc.py

@@ -15,7 +15,7 @@
 # 2007-05-07 SJM Meaningful exception instead of IndexError if a SAT (sector allocation table) is corrupted.
 # 2007-04-22 SJM Missing "<" in a struct.unpack call => can't open files on bigendian platforms.
 
-from __future__ import nested_scopes, print_function
+from __future__ import print_function
 import sys
 from struct import unpack
 from .timemachine import *

xlrd/examples/xlrdnameAPIdemo.py

@@ -77,9 +77,8 @@ def showable_cell_value(celltype, cellvalue, datemode):
     if celltype == xlrd.XL_CELL_DATE:
         try:
             showval = xlrd.xldate_as_tuple(cellvalue, datemode)
-        except xlrd.XLDateError:
-            e1, e2 = sys.exc_info()[:2]
-            showval = "%s:%s" % (e1.__name__, e2)
+        except xlrd.XLDateError as e:
+            showval = "%s:%s" % (type(e).__name__, e)
     elif celltype == xlrd.XL_CELL_ERROR:
         showval = xlrd.error_text_from_code.get(
             cellvalue, '<Unknown error code 0x%02x>' % cellvalue)

xlrd/xlsx.py

@@ -692,15 +692,6 @@ def bad_child_tag(child_tag):
         }
     augment_keys(tag2meth, U_SSML12)
 
-def getzflo(zipfile, member_path):
-    # GET a Zipfile File-Like Object for passing to
-    # an XML parser
-    try:
-        return zipfile.open(member_path) # CPython 2.6 onwards
-    except AttributeError:
-        # old way
-        return BYTES_IO(zipfile.read(member_path))
-
 def open_workbook_2007_xml(
     zf,
     component_names,
@@ -727,20 +718,20 @@ def open_workbook_2007_xml(
     bk.ragged_rows = ragged_rows
 
     x12book = X12Book(bk, logfile, verbosity)
-    zflo = getzflo(zf, 'xl/_rels/workbook.xml.rels')
+    zflo = zf.open('xl/_rels/workbook.xml.rels')
     x12book.process_rels(zflo)
     del zflo
-    zflo = getzflo(zf, 'xl/workbook.xml')
+    zflo = zf.open('xl/workbook.xml')
     x12book.process_stream(zflo, 'Workbook')
     del zflo
     props_name = 'docProps/core.xml'
     if props_name in component_names:
-        zflo = getzflo(zf, props_name)
+        zflo = zf.open(props_name)
         x12book.process_coreprops(zflo)
 
     x12sty = X12Styles(bk, logfile, verbosity)
     if 'xl/styles.xml' in component_names:
-        zflo = getzflo(zf, 'xl/styles.xml')
+        zflo = zf.open('xl/styles.xml')
         x12sty.process_stream(zflo, 'styles')
         del zflo
     else:
@@ -750,13 +741,13 @@ def open_workbook_2007_xml(
     sst_fname = 'xl/sharedStrings.xml'
     x12sst = X12SST(bk, logfile, verbosity)
     if sst_fname in component_names:
-        zflo = getzflo(zf, sst_fname)
+        zflo = zf.open(sst_fname)
         x12sst.process_stream(zflo, 'SST')
         del zflo
 
     for sheetx in range(bk.nsheets):
         fname = x12book.sheet_targets[sheetx]
-        zflo = getzflo(zf, fname)
+        zflo = zf.open(fname)
         sheet = bk._sheet_list[sheetx]
         x12sheet = X12Sheet(sheet, logfile, verbosity)
         heading = "Sheet %r (sheetx=%d) from %r" % (sheet.name, sheetx, fname)