RefactoringTool: Adding transformation: apply RefactoringTool: Adding transformation: asserts RefactoringTool: Adding transformation: basestring RefactoringTool: Skipping optional fixer: buffer RefactoringTool: Adding transformation: dict RefactoringTool: Adding transformation: except RefactoringTool: Adding transformation: exec RefactoringTool: Adding transformation: execfile RefactoringTool: Adding transformation: exitfunc RefactoringTool: Adding transformation: filter RefactoringTool: Adding transformation: funcattrs RefactoringTool: Adding transformation: future RefactoringTool: Adding transformation: getcwdu RefactoringTool: Adding transformation: has_key RefactoringTool: Skipping optional fixer: idioms RefactoringTool: Adding transformation: import RefactoringTool: Adding transformation: imports RefactoringTool: Adding transformation: imports2 RefactoringTool: Adding transformation: input RefactoringTool: Adding transformation: intern RefactoringTool: Adding transformation: isinstance RefactoringTool: Adding transformation: itertools RefactoringTool: Adding transformation: itertools_imports RefactoringTool: Adding transformation: long RefactoringTool: Adding transformation: map RefactoringTool: Adding transformation: metaclass RefactoringTool: Adding transformation: methodattrs RefactoringTool: Adding transformation: ne RefactoringTool: Adding transformation: next RefactoringTool: Adding transformation: nonzero RefactoringTool: Adding transformation: numliterals RefactoringTool: Adding transformation: operator RefactoringTool: Adding transformation: paren RefactoringTool: Adding transformation: print RefactoringTool: Adding transformation: raise RefactoringTool: Adding transformation: raw_input RefactoringTool: Adding transformation: reduce RefactoringTool: Adding transformation: reload RefactoringTool: Adding transformation: renames RefactoringTool: Adding transformation: repr RefactoringTool: Skipping optional fixer: set_literal RefactoringTool: Adding transformation: standarderror RefactoringTool: Adding transformation: sys_exc RefactoringTool: Adding transformation: throw RefactoringTool: Adding transformation: tuple_params RefactoringTool: Adding transformation: types RefactoringTool: Adding transformation: unicode RefactoringTool: Adding transformation: urllib RefactoringTool: Skipping optional fixer: ws_comma RefactoringTool: Adding transformation: xrange RefactoringTool: Adding transformation: xreadlines RefactoringTool: Adding transformation: zip RefactoringTool: Refactoring xlsx2csv.py RefactoringTool: Refactored xlsx2csv.py RefactoringTool: Wrote changes to xlsx2csv.py RefactoringTool: Files that were modified: RefactoringTool: xlsx2csv.py --- xlsx2csv.py (original) +++ xlsx2csv.py (refactored) @@ -148,10 +148,10 @@ attrs = sheetNode._attrs name = attrs["name"].value if self.appName == 'xl': - if attrs.has_key('r:id'): id = int(attrs["r:id"].value[3:]) + if 'r:id' in attrs: id = int(attrs["r:id"].value[3:]) else: id = int(attrs['sheetId'].value) else: - if attrs.has_key('sheetId'): id = int(attrs["sheetId"].value) + if 'sheetId' in attrs: id = int(attrs["sheetId"].value) else: id = int(attrs['r:id'].value[3:]) self.sheets.append({'name': name, 'id': id}) @@ -272,18 +272,18 @@ # get cell format format = None xfs_numfmt = self.styles.cellXfs[s] - if self.styles.numFmts.has_key(xfs_numfmt): + if xfs_numfmt in self.styles.numFmts: format = self.styles.numFmts[xfs_numfmt] - elif STANDARD_FORMATS.has_key(xfs_numfmt): + elif xfs_numfmt in STANDARD_FORMATS: format = STANDARD_FORMATS[xfs_numfmt] # get format type - if format and FORMATS.has_key(format): + if format and format in FORMATS: format_type = FORMATS[format] if format_type == 'date': # date/time try: if self.workbook.date1904: - date = datetime.datetime(1904, 01, 01) + datetime.timedelta(float(data)) + date = datetime.datetime(1904, 0o1, 0o1) + datetime.timedelta(float(data)) else: date = datetime.datetime(1899, 12, 30) + datetime.timedelta(float(data)) if self.dateformat: @@ -322,12 +322,12 @@ self.in_cell_value = True #elif self.in_cell and name == 'f': # self.in_cell_formula = True - elif self.in_sheet and name == 'row' and attrs.has_key('r'): + elif self.in_sheet and name == 'row' and 'r' in attrs: self.rowNum = attrs['r'] self.in_row = True self.columns = {} self.spans = None - if attrs.has_key('spans'): + if 'spans' in attrs: self.spans = [int(i) for i in attrs['spans'].split(":")] elif name == 'sheetData': self.in_sheet = True @@ -343,9 +343,9 @@ self.columns[t - 1 + self.colIndex] = self.data self.in_cell = False if self.in_row and name == 'row': - if len(self.columns.keys()) > 0: + if len(list(self.columns.keys())) > 0: d = [""] * (max(self.columns.keys()) + 1) - for k in self.columns.keys(): + for k in list(self.columns.keys()): d[k] = self.columns[k].encode("utf-8") if self.spans: l = self.spans[0] + self.spans[1] - 1 @@ -366,7 +366,7 @@ else: if fullpath.lower().endswith(".xlsx"): outfilepath = fullpath[:-4] + 'csv' - print("Converting %s to %s" %(fullpath, outfilepath)) + print(("Converting %s to %s" %(fullpath, outfilepath))) f = open(outfilepath, 'w+b') try: xlsx2csv(fullpath, f, **kwargs)