Fix flake8 E123 warning

Appears in the console as

  E123 closing bracket does not match indentation of opening bracket's
  line

Author: jdufresne

examples/xlrdnameAPIdemo.py

@@ -54,9 +54,7 @@ def show_name_details(book, name, show_contents=0, f=sys.stdout):
     for nobj in nobj_list:
         show_name_object(book, nobj, show_contents, f)
 
-def show_name_details_in_scope(
-    book, name, scope_strg, show_contents=0, f=sys.stdout,
-    ):
+def show_name_details_in_scope(book, name, scope_strg, show_contents=0, f=sys.stdout):
     try:
         scope = int(scope_strg)
     except ValueError:

scripts/runxlrd.py

@@ -255,8 +255,8 @@ def main(cmd_args):
             "-f", "--formatting",
             type="int", default=0,
             help="0 (default): no fmt info\n"
-                 "1: fmt info (all cells)\n"
-            )
+                 "1: fmt info (all cells)\n",
+        )
         oparser.add_option(
             "-g", "--gc",
             type="int", default=0,

setup.cfg

@@ -3,7 +3,7 @@ universal = 1
 
 [flake8]
 ignore =
-    E123,E124,E125,E126,E128,
+    E124,E125,E126,E128,
     E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E266,E271,E272,
     E301,E302,E303,E305,
     E501,

setup.py

@@ -11,7 +11,7 @@
     packages = ['xlrd'],
     scripts = [
         'scripts/runxlrd.py',
-        ],
+    ],
     description = (
         'Library for developers to extract data from '
         'Microsoft Excel (tm) spreadsheet files'
@@ -26,20 +26,20 @@
     license = 'BSD',
     keywords = ['xls', 'excel', 'spreadsheet', 'workbook'],
     classifiers = [
-            'Development Status :: 5 - Production/Stable',
-            'Intended Audience :: Developers',
-            'License :: OSI Approved :: BSD License',
-            'Programming Language :: Python',
-            'Programming Language :: Python :: 2',
-            'Programming Language :: Python :: 2.7',
-            'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.4',
-            'Programming Language :: Python :: 3.5',
-            'Programming Language :: Python :: 3.6',
-            'Operating System :: OS Independent',
-            'Topic :: Database',
-            'Topic :: Office/Business',
-            'Topic :: Software Development :: Libraries :: Python Modules',
-            ],
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: BSD License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Operating System :: OS Independent',
+        'Topic :: Database',
+        'Topic :: Office/Business',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
 )

tests/test_formulas.py

@@ -29,8 +29,8 @@ def get_value(self, col, row):
     def test_cell_B2(self):
         self.assertEqual(
             self.get_value(1, 1),
-            r"'\u041c\u041e\u0421\u041a\u0412\u0410 \u041c\u043e\u0441\u043a\u0432\u0430'"
-            )
+            r"'\u041c\u041e\u0421\u041a\u0412\u0410 \u041c\u043e\u0441\u043a\u0432\u0430'",
+        )
 
     def test_cell_B3(self):
         self.assertEqual(self.get_value(1, 2), '0.14285714285714285')
@@ -50,8 +50,8 @@ def test_cell_B7(self):
     def test_cell_B8(self):
         self.assertEqual(
             self.get_value(1, 7),
-            r"'\u041c\u041e\u0421\u041a\u0412\u0410 \u041c\u043e\u0441\u043a\u0432\u0430'"
-            )
+            r"'\u041c\u041e\u0421\u041a\u0412\u0410 \u041c\u043e\u0441\u043a\u0432\u0430'",
+        )
 
 class TestNameFormulas(TestCase):
 

tests/test_open_workbook.py

@@ -12,8 +12,8 @@ class TestOpen(TestCase):
     def test_names_demo(self):
         # For now, we just check this doesn't raise an error.
         open_workbook(
-            from_this_dir(os.path.join('..','examples','namesdemo.xls'))
-            )
+            from_this_dir(os.path.join('..','examples','namesdemo.xls')),
+        )
 
     def test_ragged_rows_tidied_with_formatting(self):
         # For now, we just check this doesn't raise an error.

xlrd/__init__.py

@@ -135,7 +135,7 @@ def open_workbook(filename=None,
                 formatting_info=formatting_info,
                 on_demand=on_demand,
                 ragged_rows=ragged_rows,
-                )
+            )
             return bk
         if 'xl/workbook.bin' in component_names:
             raise XLRDError('Excel 2007 xlsb file; not supported')
@@ -154,7 +154,7 @@ def open_workbook(filename=None,
         formatting_info=formatting_info,
         on_demand=on_demand,
         ragged_rows=ragged_rows,
-        )
+    )
     return bk
 
 

xlrd/biffh.py

@@ -53,9 +53,8 @@ def dump(self, f=None, header=None, footer=None, indent=0):
                 value.dump(f,
                     header="%s%s (%s object):" % (pad, attr, value.__class__.__name__),
                     indent=indent+4)
-            elif attr not in self._repr_these and (
-                isinstance(value, list_type) or isinstance(value, dict_type)
-                ):
+            elif (attr not in self._repr_these and
+                  (isinstance(value, list_type) or isinstance(value, dict_type))):
                 print("%s%s: %s, len = %d" % (pad, attr, type(value), len(value)), file=f)
             else:
                 fprintf(f, "%s%s: %r\n", pad, attr, value)
@@ -86,7 +85,7 @@ def dump(self, f=None, header=None, footer=None, indent=0):
     70: "7",
     80: "8",
     85: "8X",
-    }
+}
 
 #: This dictionary can be used to produce a text version of the internal codes
 #: that Excel uses for error cells.
@@ -229,7 +228,7 @@ def dump(self, f=None, header=None, footer=None, indent=0):
     XL_NUMBER,
     XL_RK,
     XL_RSTRING,
-    ]
+]
 _cell_opcode_dict = {}
 for _cell_opcode in _cell_opcode_list:
     _cell_opcode_dict[_cell_opcode] = 1
@@ -630,7 +629,7 @@ def biff_count_records(mem, stream_offset, stream_len, fout=sys.stdout):
     10081: 'mac_turkish', # guess
     32768: 'mac_roman',
     32769: 'cp1252',
-    }
+}
 # some more guessing, for Indic scripts
 # codepage 57000 range:
 # 2 Devanagari [0]

xlrd/book.py

@@ -52,7 +52,7 @@
     "Auto_Deactivate":  "\x0B",
     "Sheet_Title":      "\x0C",
     "_FilterDatabase":  "\x0D",
-    }
+}
 builtin_name_from_code = {}
 code_from_builtin_name = {}
 for _bin, _bic in _code_from_builtin_name.items():
@@ -82,7 +82,7 @@ def open_workbook_xls(filename=None,
             formatting_info=formatting_info,
             on_demand=on_demand,
             ragged_rows=ragged_rows,
-            )
+        )
         t1 = time.clock()
         bk.load_time_stage_1 = t1 - t0
         biff_version = bk.getbof(XL_WORKBOOK_GLOBALS)
@@ -92,7 +92,7 @@ def open_workbook_xls(filename=None,
             raise XLRDError(
                 "BIFF version %s is not supported"
                 % biff_text_from_num[biff_version]
-                )
+            )
         bk.biff_version = biff_version
         if biff_version <= 40:
             # no workbook globals, only 1 worksheet
@@ -762,7 +762,7 @@ def handle_boundsheet(self, data):
                 1: 'Macro sheet',
                 2: 'Chart',
                 6: 'Visual Basic module',
-                }.get(sheet_type, 'UNKNOWN')
+            }.get(sheet_type, 'UNKNOWN')
 
             if DEBUG or self.verbosity >= 1:
                 fprintf(self.logfile,
@@ -873,7 +873,7 @@ def handle_externsheet(self, data):
                         self.logfile,
                         "INFO: EXTERNSHEET needs %d bytes, have %d\n",
                         bytes_reqd, len(data),
-                        )
+                    )
                 code2, length2, data2 = self.get_record_parts()
                 if code2 != XL_CONTINUE:
                     raise XLRDError("Missing CONTINUE after EXTERNSHEET record")
@@ -889,7 +889,7 @@ def handle_externsheet(self, data):
                         self.logfile,
                         "EXTERNSHEET(b8): k = %2d, record = %2d, first_sheet = %5d, last sheet = %5d\n",
                         k, ref_recordx, ref_first_sheetx, ref_last_sheetx,
-                        )
+                    )
         else:
             nc, ty = unpack("<BB", data[:2])
             if blah2:
@@ -900,7 +900,7 @@ def handle_externsheet(self, data):
                     2: "Current sheet!!",
                     3: "Specific sheet in own doc't",
                     4: "Nonspecific sheet in own doc't!!",
-                    }.get(ty, "Not encoded")
+                }.get(ty, "Not encoded")
                 print("   %3d chars, type is %d (%s)" % (nc, ty, msg), file=self.logfile)
             if ty == 3:
                 sheet_name = unicode(data[2:nc+2], self.encoding)
@@ -951,7 +951,7 @@ def handle_name(self, data):
         nobj.name_index = name_index
         self.name_obj_list.append(nobj)
         nobj.option_flags = option_flags
-        for attr, mask, nshift in (
+        attrs = [
             ('hidden', 1, 0),
             ('func', 2, 1),
             ('vbasic', 4, 2),
@@ -960,7 +960,8 @@ def handle_name(self, data):
             ('builtin', 0x20, 5),
             ('funcgroup', 0xFC0, 6),
             ('binary', 0x1000, 12),
-            ):
+        ]
+        for attr, mask, nshift in attrs:
             setattr(nobj, attr, (option_flags & mask) >> nshift)
 
         macro_flag = " M"[nobj.macro]
@@ -990,7 +991,7 @@ def handle_name(self, data):
                 self.logfile,
                 header="--- handle_name: name[%d] ---" % name_index,
                 footer="-------------------",
-                )
+            )
 
     def names_epilogue(self):
         blah = self.verbosity >= 2
@@ -1111,10 +1112,11 @@ def handle_supbook(self, data):
                 # #### FIX ME ####
                 # Should implement handling of CONTINUE record(s) ...
                 if self.verbosity:
-                    print((
+                    print(
                         "*** WARNING: unpack failure in sheet %d of %d in SUPBOOK record for file %r"
-                        % (x, num_sheets, url)
-                        ), file=self.logfile)
+                        % (x, num_sheets, url),
+                        file=self.logfile,
+                    )
                 break
             sheet_names.append(shname)
             if blah: fprintf(self.logfile, "  sheetx=%d namelen=%d name=%r (next pos=%d)\n", x, len(shname), shname, pos)
@@ -1307,7 +1309,7 @@ def bof_error(msg):
                     0x0200: 21,
                     0x0300: 30,
                     0x0400: 40,
-                    }.get(version2, 0)
+                }.get(version2, 0)
         elif version1 in (0x04, 0x02, 0x00):
             version = {0x04: 40, 0x02: 30, 0x00: 21}[version1]
 
@@ -1328,7 +1330,7 @@ def bof_error(msg):
         bof_error(
             'BOF not workbook/worksheet: op=0x%04x vers=0x%04x strm=0x%04x build=%d year=%d -> BIFF%d'
             % (opcode, version2, streamtype, build, year, version)
-            )
+        )
 
 # === helper functions
 

xlrd/compdoc.py

@@ -56,7 +56,7 @@ def dump(self, DEBUG=1):
             "DID=%d name=%r etype=%d DIDs(left=%d right=%d root=%d parent=%d kids=%r) first_SID=%d tot_size=%d\n",
             self.DID, self.name, self.etype, self.left_DID,
             self.right_DID, self.root_DID, self.parent, self.children, self.first_SID, self.tot_size
-            )
+        )
         if DEBUG == 2:
             # cre_lo, cre_hi, mod_lo, mod_hi = tsinfo
             print("timestamp info", self.tsinfo, file=self.logfile)
@@ -300,7 +300,7 @@ def _get_stream(self, mem, base, sat, sec_size, start_sid, size=None, name='', s
                     raise CompDocError(
                         "OLE2 stream %r: sector allocation table invalid entry (%d)" %
                         (name, s)
-                        )
+                    )
             assert s == EOCSID
         else:
             todo = size
@@ -321,7 +321,7 @@ def _get_stream(self, mem, base, sat, sec_size, start_sid, size=None, name='', s
                     raise CompDocError(
                         "OLE2 stream %r: sector allocation table invalid entry (%d)" %
                         (name, s)
-                        )
+                    )
             assert s == EOCSID
             if todo != 0:
                 fprintf(self.logfile,
@@ -407,8 +407,8 @@ def locate_named_stream(self, qname):
                     self.SSCS, 0, self.SSAT, self.short_sec_size, d.first_SID,
                     d.tot_size, qname + " (from SSCS)", None),
                 0,
-                d.tot_size
-                )
+                d.tot_size,
+            )
 
     def _locate_stream(self, mem, base, sat, sec_size, start_sid, expected_stream_size, qname, seen_id):
         # print >> self.logfile, "_locate_stream", base, sec_size, start_sid, expected_stream_size
@@ -428,10 +428,11 @@ def _locate_stream(self, mem, base, sat, sec_size, start_sid, expected_stream_si
             self.seen[s] = seen_id
             tot_found += 1
             if tot_found > found_limit:
+                # Note: expected size rounded up to higher sector
                 raise CompDocError(
                     "%s: size exceeds expected %d bytes; corrupt?"
                     % (qname, found_limit * sec_size)
-                    ) # Note: expected size rounded up to higher sector
+                )
             if s == p+1:
                 # contiguous sectors
                 end_pos += sec_size