diff options
| -rw-r--r-- | changelog.py | 4 | ||||
| -rw-r--r-- | cli.py | 4 | ||||
| -rw-r--r-- | compat.py | 2 | ||||
| -rw-r--r-- | configuration.py | 8 | ||||
| -rw-r--r-- | corbautils.py | 4 | ||||
| -rw-r--r-- | daemon.py | 4 | ||||
| -rw-r--r-- | date.py | 70 | ||||
| -rw-r--r-- | debugger.py | 4 | ||||
| -rw-r--r-- | graph.py | 2 | ||||
| -rw-r--r-- | pdf_ext.py | 2 | ||||
| -rw-r--r-- | pytest.py | 4 | ||||
| -rw-r--r-- | shellutils.py | 6 | ||||
| -rw-r--r-- | table.py | 22 | ||||
| -rw-r--r-- | test/unittest_cache.py | 4 | ||||
| -rw-r--r-- | test/unittest_compat.py | 28 | ||||
| -rw-r--r-- | test/unittest_configuration.py | 6 | ||||
| -rw-r--r-- | test/unittest_date.py | 20 | ||||
| -rw-r--r-- | test/unittest_fileutils.py | 2 | ||||
| -rw-r--r-- | test/unittest_modutils.py | 10 | ||||
| -rw-r--r-- | test/unittest_pytest.py | 8 | ||||
| -rw-r--r-- | test/unittest_shellutils.py | 38 | ||||
| -rw-r--r-- | test/unittest_table.py | 86 | ||||
| -rw-r--r-- | test/unittest_testlib.py | 18 | ||||
| -rw-r--r-- | test/unittest_textutils.py | 12 | ||||
| -rw-r--r-- | test/unittest_tree.py | 20 | ||||
| -rw-r--r-- | test/utils.py | 2 | ||||
| -rw-r--r-- | testlib.py | 16 | ||||
| -rw-r--r-- | textutils.py | 38 | ||||
| -rw-r--r-- | vcgutils.py | 32 |
29 files changed, 238 insertions, 238 deletions
diff --git a/changelog.py b/changelog.py index fedf847..b65a419 100644 --- a/changelog.py +++ b/changelog.py @@ -72,7 +72,7 @@ class Version(tuple): try: parsed = [int(i) for i in versionstr.split('.')] except ValueError, ex: - raise ValueError("invalid literal for version '%s' (%s)"%(versionstr,ex)) + raise ValueError("invalid literal for version '%s' (%s)"%(versionstr, ex)) else: parsed = versionstr return tuple.__new__(klass, parsed) @@ -99,7 +99,7 @@ class ChangeLogEntry(object): def add_message(self, msg): """add a new message""" - self.messages.append(([msg],[])) + self.messages.append(([msg], [])) def complete_latest_message(self, msg_suite): """complete the latest added message @@ -92,8 +92,8 @@ class CLIHelper: and provide an help system. """ - CMD_MAP = {'help' : _("Others"), - 'quit' : _("Others"), + CMD_MAP = {'help': _("Others"), + 'quit': _("Others"), } CMD_PREFIX = '' @@ -122,7 +122,7 @@ except NameError: # py2.3 try: max = max - max(("ab","cde"),key=len) # does not work in py2.3 + max(("ab", "cde"), key=len) # does not work in py2.3 except TypeError: def max( *args, **kargs): if len(args) == 0: diff --git a/configuration.py b/configuration.py index 8606de5..2de850f 100644 --- a/configuration.py +++ b/configuration.py @@ -196,8 +196,8 @@ def bytes_validator(optdict, name, value): return optparse.check_bytes(None, name, value) -VALIDATORS = {'string' : unquote, - 'int' : int, +VALIDATORS = {'string': unquote, + 'int': int, 'float': float, 'file': file_validator, 'font': unquote, @@ -341,7 +341,7 @@ def format_option_value(optdict, value): if isinstance(value, (list, tuple)): value = ','.join(value) elif isinstance(value, dict): - value = ','.join(['%s:%s' % (k,v) for k,v in value.items()]) + value = ','.join(['%s:%s' % (k, v) for k, v in value.items()]) elif hasattr(value, 'match'): # optdict.get('type') == 'regexp' # compiled regexp value = value.pattern @@ -400,7 +400,7 @@ def rest_format_section(stream, section, options, encoding=None, doc=None): if value: value = _encode(format_option_value(optdict, value), encoding) print >> stream, '' - print >> stream, ' Default: ``%s``' % value.replace("`` ","```` ``") + print >> stream, ' Default: ``%s``' % value.replace("`` ", "```` ``") class OptionsManagerMixIn(object): diff --git a/corbautils.py b/corbautils.py index fa1b6c5..e539a6c 100644 --- a/corbautils.py +++ b/corbautils.py @@ -50,7 +50,7 @@ def get_root_context(): orb = get_orb() nss = orb.resolve_initial_references("NameService") rootContext = nss._narrow(CosNaming.NamingContext) - assert rootContext is not None,"Failed to narrow root naming context" + assert rootContext is not None, "Failed to narrow root naming context" return rootContext def register_object_name(object, namepath): @@ -77,7 +77,7 @@ def register_object_name(object, namepath): assert context is not None, \ 'test context exists but is not a NamingContext' - id,kind = namepath[-1] + id, kind = namepath[-1] name = [CosNaming.NameComponent(id, kind)] try: context.bind(name, object._this()) @@ -168,10 +168,10 @@ def print_help(modconfig): Defaults to %s""" % (modconfig.LOG_TRESHOLD, modconfig.DELAY) def handle_option(modconfig, opt_name, opt_value, help_meth): - if opt_name in ('-h','--help'): + if opt_name in ('-h', '--help'): help_meth() sys.exit(0) - elif opt_name in ('-l','--log'): + elif opt_name in ('-l', '--log'): modconfig.LOG_TRESHOLD = int(opt_value) elif opt_name in ('-d', '--delay'): modconfig.DELAY = int(opt_value) @@ -38,52 +38,52 @@ else: # as we have in lgc.db ? FRENCH_FIXED_HOLIDAYS = { - 'jour_an' : '%s-01-01', - 'fete_travail' : '%s-05-01', - 'armistice1945' : '%s-05-08', - 'fete_nat' : '%s-07-14', - 'assomption' : '%s-08-15', - 'toussaint' : '%s-11-01', - 'armistice1918' : '%s-11-11', - 'noel' : '%s-12-25', + 'jour_an': '%s-01-01', + 'fete_travail': '%s-05-01', + 'armistice1945': '%s-05-08', + 'fete_nat': '%s-07-14', + 'assomption': '%s-08-15', + 'toussaint': '%s-11-01', + 'armistice1918': '%s-11-11', + 'noel': '%s-12-25', } FRENCH_MOBILE_HOLIDAYS = { - 'paques2004' : '2004-04-12', - 'ascension2004' : '2004-05-20', - 'pentecote2004' : '2004-05-31', + 'paques2004': '2004-04-12', + 'ascension2004': '2004-05-20', + 'pentecote2004': '2004-05-31', - 'paques2005' : '2005-03-28', - 'ascension2005' : '2005-05-05', - 'pentecote2005' : '2005-05-16', + 'paques2005': '2005-03-28', + 'ascension2005': '2005-05-05', + 'pentecote2005': '2005-05-16', - 'paques2006' : '2006-04-17', - 'ascension2006' : '2006-05-25', - 'pentecote2006' : '2006-06-05', + 'paques2006': '2006-04-17', + 'ascension2006': '2006-05-25', + 'pentecote2006': '2006-06-05', - 'paques2007' : '2007-04-09', - 'ascension2007' : '2007-05-17', - 'pentecote2007' : '2007-05-28', + 'paques2007': '2007-04-09', + 'ascension2007': '2007-05-17', + 'pentecote2007': '2007-05-28', - 'paques2008' : '2008-03-24', - 'ascension2008' : '2008-05-01', - 'pentecote2008' : '2008-05-12', + 'paques2008': '2008-03-24', + 'ascension2008': '2008-05-01', + 'pentecote2008': '2008-05-12', - 'paques2009' : '2009-04-13', - 'ascension2009' : '2009-05-21', - 'pentecote2009' : '2009-06-01', + 'paques2009': '2009-04-13', + 'ascension2009': '2009-05-21', + 'pentecote2009': '2009-06-01', - 'paques2010' : '2010-04-05', - 'ascension2010' : '2010-05-13', - 'pentecote2010' : '2010-05-24', + 'paques2010': '2010-04-05', + 'ascension2010': '2010-05-13', + 'pentecote2010': '2010-05-24', - 'paques2011' : '2011-04-25', - 'ascension2011' : '2011-06-02', - 'pentecote2011' : '2011-06-13', + 'paques2011': '2011-04-25', + 'ascension2011': '2011-06-02', + 'pentecote2011': '2011-06-13', - 'paques2012' : '2012-04-09', - 'ascension2012' : '2012-05-17', - 'pentecote2012' : '2012-05-28', + 'paques2012': '2012-04-09', + 'ascension2012': '2012-05-17', + 'pentecote2012': '2012-05-28', } # XXX this implementation cries for multimethod dispatching diff --git a/debugger.py b/debugger.py index 03c1683..8d2bf6e 100644 --- a/debugger.py +++ b/debugger.py @@ -153,7 +153,7 @@ class Debugger(Pdb): expr, attr = m.group(1, 3) object = eval(expr, namespace) words = dir(object) - if hasattr(object,'__class__'): + if hasattr(object, '__class__'): words.append('__class__') words = words + self.get_class_members(object.__class__) matches = [] @@ -166,7 +166,7 @@ class Debugger(Pdb): def get_class_members(self, klass): """implementation coming from rlcompleter.get_class_members""" ret = dir(klass) - if hasattr(klass,'__bases__'): + if hasattr(klass, '__bases__'): for base in klass.__bases__: ret = ret + self.get_class_members(base) return ret @@ -106,7 +106,7 @@ class DotBackend: ppng, outputfile = tempfile.mkstemp(".png", name) os.close(pdot) os.close(ppng) - pdot = open(dot_sourcepath,'w') + pdot = open(dot_sourcepath, 'w') pdot.write(str_encode(self.source, 'utf8')) pdot.close() if target != 'dot': @@ -86,7 +86,7 @@ def write_field(out, key, value): def write_fields(out, fields): out.write(HEAD) - for (key,value,comment) in fields: + for (key, value, comment) in fields: write_field(out, key, value) write_field(out, key+"a", value) # pour copie-carbone sur autres pages out.write(TAIL) @@ -390,7 +390,7 @@ class PyTester(object): restartfile.close() except Exception, e: print >> sys.__stderr__, "Error while overwriting \ -succeeded test file :", osp.join(os.getcwd(),testlib.FILE_RESTART) +succeeded test file :", osp.join(os.getcwd(), testlib.FILE_RESTART) raise e # run test and collect information prog = self.testfile(filename, batchmode=True) @@ -417,7 +417,7 @@ succeeded test file :", osp.join(os.getcwd(),testlib.FILE_RESTART) restartfile.close() except Exception, e: print >> sys.__stderr__, "Error while overwriting \ -succeeded test file :", osp.join(os.getcwd(),testlib.FILE_RESTART) +succeeded test file :", osp.join(os.getcwd(), testlib.FILE_RESTART) raise e modname = osp.basename(filename)[:-3] try: diff --git a/shellutils.py b/shellutils.py index c955283..ba0f79d 100644 --- a/shellutils.py +++ b/shellutils.py @@ -232,8 +232,8 @@ class Execute: errfile = tempfile.mktemp() self.status = os.system("( %s ) >%s 2>%s" % (command, outfile, errfile)) >> 8 - self.out = open(outfile,"r").read() - self.err = open(errfile,"r").read() + self.out = open(outfile, "r").read() + self.err = open(errfile, "r").read() os.remove(outfile) os.remove(errfile) @@ -415,7 +415,7 @@ class RawInput(object): def confirm(self, question, default_is_yes=True): default = default_is_yes and 'y' or 'n' - answer = self.ask(question, ('y','n'), default) + answer = self.ask(question, ('y', 'n'), default) return answer == 'y' ASK = RawInput() @@ -322,25 +322,25 @@ class Table(object): else: rows = indices # define row slice - if isinstance(rows,str): + if isinstance(rows, str): try: rows = self.row_names.index(rows) except ValueError: raise KeyError("Row (%s) not found in table" % (rows)) - if isinstance(rows,int): - rows = slice(rows,rows+1) + if isinstance(rows, int): + rows = slice(rows, rows+1) multirows = False else: rows = slice(None) multirows = True # define col slice - if isinstance(cols,str): + if isinstance(cols, str): try: cols = self.col_names.index(cols) except ValueError: raise KeyError("Column (%s) not found in table" % (cols)) - if isinstance(cols,int): - cols = slice(cols,cols+1) + if isinstance(cols, int): + cols = slice(cols, cols+1) multicols = False else: cols = slice(None) @@ -350,7 +350,7 @@ class Table(object): tab.default_value = self.default_value tab.create_rows(self.row_names[rows]) tab.create_columns(self.col_names[cols]) - for idx,row in enumerate(self.data[rows]): + for idx, row in enumerate(self.data[rows]): tab.set_row(idx, row[cols]) if multirows : if multicols: @@ -398,7 +398,7 @@ class Table(object): def get_columns(self): """Returns all the columns in the table """ - return [self[:,index] for index in range(len(self.col_names))] + return [self[:, index] for index in range(len(self.col_names))] def get_column(self, col_index, distinct=False): """get a column by index""" @@ -488,17 +488,17 @@ class TableStyle: def __init__(self, table): self._table = table - self.size = dict([(col_name,'1*') for col_name in table.col_names]) + self.size = dict([(col_name, '1*') for col_name in table.col_names]) # __row_column__ is a special key to define the first column which # actually has no name (<=> left most column <=> row names column) self.size['__row_column__'] = '1*' - self.alignment = dict([(col_name,'right') + self.alignment = dict([(col_name, 'right') for col_name in table.col_names]) self.alignment['__row_column__'] = 'right' # We shouldn't have to create an entry for # the 1st col (the row_column one) - self.units = dict([(col_name,'') for col_name in table.col_names]) + self.units = dict([(col_name, '') for col_name in table.col_names]) self.units['__row_column__'] = '' # XXX FIXME : params order should be reversed for all set() methods diff --git a/test/unittest_cache.py b/test/unittest_cache.py index c5dddcf..3e4b185 100644 --- a/test/unittest_cache.py +++ b/test/unittest_cache.py @@ -95,8 +95,8 @@ class CacheTestCase(TestCase): """ self.cache['foo'] = 'bar' del self.cache['foo'] - self.assert_('foo' not in self.cache.keys(),"Element 'foo' was not removed cache dictionnary") - self.assert_('foo' not in self.cache._usage,"Element 'foo' was not removed usage list") + self.assert_('foo' not in self.cache.keys(), "Element 'foo' was not removed cache dictionnary") + self.assert_('foo' not in self.cache._usage, "Element 'foo' was not removed usage list") self.assertItemsEqual(self.cache._usage, self.cache.keys())# usage list and data keys are different diff --git a/test/unittest_compat.py b/test/unittest_compat.py index 90b8994..9993f1d 100644 --- a/test/unittest_compat.py +++ b/test/unittest_compat.py @@ -84,7 +84,7 @@ class CompatTCMixIn: class Py23CompatTC(CompatTCMixIn, TestCase): MODNAMES = { - 'sets' : ('Set', 'ImmutableSet'), + 'sets': ('Set', 'ImmutableSet'), } def test_basic_set(self): @@ -209,21 +209,21 @@ class Py25CompatTC(CompatTCMixIn, TestCase): from logilab.common.compat import max # old apy - self.assertEqual(max("fdjkmhsgmdfhsg"),'s') - self.assertEqual(max(1,43,12,45,1337,34,2), 1337) - self.assertRaises(TypeError,max) - self.assertRaises(TypeError,max,1) - self.assertRaises(ValueError,max,[]) - self.assertRaises(TypeError,max,bob=None) + self.assertEqual(max("fdjkmhsgmdfhsg"), 's') + self.assertEqual(max(1, 43, 12, 45, 1337, 34, 2), 1337) + self.assertRaises(TypeError, max) + self.assertRaises(TypeError, max, 1) + self.assertRaises(ValueError, max, []) + self.assertRaises(TypeError, max, bob=None) # new apy - self.assertEqual(max("shorter","longer",key=len),"shorter") - self.assertEqual(max(((1,1),(2,3,5),(8,13,21)),key=len),(2,3,5)) - self.assertEqual(max(((1,1),(42,),(2,3,5),(8,13,21)),key=max),(42,)) - self.assertRaises(TypeError,max,key=None) - self.assertRaises(TypeError,max,1,key=len) - self.assertRaises(ValueError,max,[],key=max) - self.assertRaises(TypeError,max,"shorter","longer",key=len,kathy=None) + self.assertEqual(max("shorter", "longer", key=len), "shorter") + self.assertEqual(max(((1, 1), (2, 3, 5), (8, 13, 21)), key=len), (2, 3, 5)) + self.assertEqual(max(((1, 1), (42,), (2, 3, 5), (8, 13, 21)), key=max), (42,)) + self.assertRaises(TypeError, max, key=None) + self.assertRaises(TypeError, max, 1, key=len) + self.assertRaises(ValueError, max, [], key=max) + self.assertRaises(TypeError, max, "shorter", "longer", key=len, kathy=None) if __name__ == '__main__': diff --git a/test/unittest_configuration.py b/test/unittest_configuration.py index 11e9f33..689a067 100644 --- a/test/unittest_configuration.py +++ b/test/unittest_configuration.py @@ -31,7 +31,7 @@ DATA = join(dirname(abspath(__file__)), 'data') options = [('dothis', {'type':'yn', 'action': 'store', 'default': True, 'metavar': '<y or n>'}), ('value', {'type': 'string', 'metavar': '<string>', 'short': 'v'}), - ('multiple', {'type': 'csv', 'default': ('yop','yep'), + ('multiple', {'type': 'csv', 'default': ('yop', 'yep'), 'metavar': '<comma separated values>', 'help': 'you can also document the option'}), ('number', {'type': 'int', 'default':2, 'metavar':'<int>', 'help': 'boom'}), @@ -62,7 +62,7 @@ class ConfigurationTC(TestCase): cfg = self.cfg self.assertEqual(cfg['dothis'], True) self.assertEqual(cfg['value'], None) - self.assertEqual(cfg['multiple'], ('yop','yep')) + self.assertEqual(cfg['multiple'], ('yop', 'yep')) self.assertEqual(cfg['number'], 2) self.assertEqual(cfg['choice'], 'yo') self.assertEqual(cfg['multiple-choice'], ('yo', 'ye')) @@ -142,7 +142,7 @@ diffgroup=zou self.cfg.load_file_configuration(file) self.assertEqual(self.cfg['dothis'], False) self.assertEqual(self.cfg['value'], None) - self.assertEqual(self.cfg['multiple'], ['yop','yepii']) + self.assertEqual(self.cfg['multiple'], ['yop', 'yepii']) self.assertEqual(self.cfg['diffgroup'], 'zou') finally: os.remove(file) diff --git a/test/unittest_date.py b/test/unittest_date.py index a37abfd..701a473 100644 --- a/test/unittest_date.py +++ b/test/unittest_date.py @@ -40,14 +40,14 @@ class DateTC(TestCase): def test_day(self): """enumerate days""" - r = list(date_range(self.datecls(2000,1,1), self.datecls(2000,1,4))) - expected = [self.datecls(2000,1,1), self.datecls(2000,1,2), self.datecls(2000,1,3)] + r = list(date_range(self.datecls(2000, 1, 1), self.datecls(2000, 1, 4))) + expected = [self.datecls(2000, 1, 1), self.datecls(2000, 1, 2), self.datecls(2000, 1, 3)] self.assertListEqual(r, expected) - r = list(date_range(self.datecls(2000,1,31), self.datecls(2000,2,3))) - expected = [self.datecls(2000,1,31), self.datecls(2000,2,1), self.datecls(2000,2,2)] + r = list(date_range(self.datecls(2000, 1, 31), self.datecls(2000, 2, 3))) + expected = [self.datecls(2000, 1, 31), self.datecls(2000, 2, 1), self.datecls(2000, 2, 2)] self.assertListEqual(r, expected) - r = list(date_range(self.datecls(2000,1,1), self.datecls(2000,1,6), 2)) - expected = [self.datecls(2000,1,1), self.datecls(2000,1,3), self.datecls(2000,1,5)] + r = list(date_range(self.datecls(2000, 1, 1), self.datecls(2000, 1, 6), 2)) + expected = [self.datecls(2000, 1, 1), self.datecls(2000, 1, 3), self.datecls(2000, 1, 5)] self.assertListEqual(r, expected) def test_add_days_worked(self): @@ -147,11 +147,11 @@ class MxDateTC(DateTC): def test_month(self): """enumerate months""" - r = list(date_range(self.datecls(2000,1,2), self.datecls(2000,4,4), endOfMonth)) - expected = [self.datecls(2000,1,2), self.datecls(2000,2,29), self.datecls(2000,3,31)] + r = list(date_range(self.datecls(2000, 1, 2), self.datecls(2000, 4, 4), endOfMonth)) + expected = [self.datecls(2000, 1, 2), self.datecls(2000, 2, 29), self.datecls(2000, 3, 31)] self.assertListEqual(r, expected) - r = list(date_range(self.datecls(2000,11,30), self.datecls(2001,2,3), endOfMonth)) - expected = [self.datecls(2000,11,30), self.datecls(2000,12,31), self.datecls(2001,1,31)] + r = list(date_range(self.datecls(2000, 11, 30), self.datecls(2001, 2, 3), endOfMonth)) + expected = [self.datecls(2000, 11, 30), self.datecls(2000, 12, 31), self.datecls(2001, 1, 31)] self.assertListEqual(r, expected) if __name__ == '__main__': diff --git a/test/unittest_fileutils.py b/test/unittest_fileutils.py index b76196f..7730e22 100644 --- a/test/unittest_fileutils.py +++ b/test/unittest_fileutils.py @@ -26,7 +26,7 @@ from logilab.common.testlib import TestCase, unittest_main, unittest from logilab.common.fileutils import * DATA_DIR = join(os.path.abspath(os.path.dirname(__file__)), 'data') -NEWLINES_TXT = join(DATA_DIR,'newlines.txt') +NEWLINES_TXT = join(DATA_DIR, 'newlines.txt') class FirstleveldirectoryTC(TestCase): diff --git a/test/unittest_modutils.py b/test/unittest_modutils.py index 92e3d04..42cd7d5 100644 --- a/test/unittest_modutils.py +++ b/test/unittest_modutils.py @@ -39,7 +39,7 @@ DATADIR = path.join(path.dirname(__file__), 'data') class TestCase(TLTestCase): def setUp(self): - super(TestCase,self).setUp() + super(TestCase, self).setUp() self.__common_in_path = common.__path__[0] in sys.path if self.__common_in_path: sys.path.remove(common.__path__[0]) @@ -47,7 +47,7 @@ class TestCase(TLTestCase): def tearDown(self): if self.__common_in_path: sys.path.insert(0, common.__path__[0]) - super(TestCase,self).tearDown() + super(TestCase, self).tearDown() class _module_file_tc(TestCase): def test_find_zipped_module(self): @@ -155,7 +155,7 @@ class get_source_file_tc(TestCase): path.__file__.replace('.pyc', '.py')) def test_raise(self): - self.assertRaises(modutils.NoSourceFile, modutils.get_source_file,'whatever') + self.assertRaises(modutils.NoSourceFile, modutils.get_source_file, 'whatever') class is_standard_module_tc(TestCase): """ @@ -230,7 +230,7 @@ class get_modules_files_tc(TestCase): in subdirectories """ import data - modules = modutils.get_module_files(path.join(DATADIR,'find_test'), data.__path__[0]) + modules = modutils.get_module_files(path.join(DATADIR, 'find_test'), data.__path__[0]) modules.sort() self.assertEqual(modules, [path.join(DATADIR, 'find_test', x) for x in ['__init__.py', 'module.py', 'module2.py', 'noendingnewline.py', 'nonregr.py']]) @@ -240,7 +240,7 @@ class get_modules_files_tc(TestCase): import logilab del logilab.common.fileutils del sys.modules['logilab.common.fileutils'] - m = modutils.load_module_from_modpath(['logilab','common', 'fileutils']) + m = modutils.load_module_from_modpath(['logilab', 'common', 'fileutils']) self.assert_( hasattr(logilab, 'common') ) self.assert_( hasattr(logilab.common, 'fileutils') ) self.assert_( m is logilab.common.fileutils ) diff --git a/test/unittest_pytest.py b/test/unittest_pytest.py index 56fab55..fc5fbca 100644 --- a/test/unittest_pytest.py +++ b/test/unittest_pytest.py @@ -31,8 +31,8 @@ class ModuleFunctionTC(TestCase): self.assertFalse(this_is_a_testdir("this_is_not_a_dir_test")) self.assertFalse(this_is_a_testdir("this_is_not_a_testdir")) self.assertFalse(this_is_a_testdir("unittestsarenothere")) - self.assertTrue(this_is_a_testdir(join("coincoin","unittests"))) - self.assertFalse(this_is_a_testdir(join("unittests","spongebob"))) + self.assertTrue(this_is_a_testdir(join("coincoin", "unittests"))) + self.assertFalse(this_is_a_testdir(join("unittests", "spongebob"))) def test_this_is_testfile(self): self.assertTrue(this_is_a_testfile("test.py")) @@ -43,8 +43,8 @@ class ModuleFunctionTC(TestCase): self.assertFalse(this_is_a_testfile("zephir_test.py")) self.assertFalse(this_is_a_testfile("smoketest.pl")) self.assertFalse(this_is_a_testfile("unittest")) - self.assertTrue(this_is_a_testfile(join("coincoin","unittest_bibi.py"))) - self.assertFalse(this_is_a_testfile(join("unittest","spongebob.py"))) + self.assertTrue(this_is_a_testfile(join("coincoin", "unittest_bibi.py"))) + self.assertFalse(this_is_a_testfile(join("unittest", "spongebob.py"))) if __name__ == '__main__': unittest_main() diff --git a/test/unittest_shellutils.py b/test/unittest_shellutils.py index 10a51c0..56314be 100644 --- a/test/unittest_shellutils.py +++ b/test/unittest_shellutils.py @@ -78,7 +78,7 @@ class ProgressBarTC(TestCase): def test_refresh(self): pgb_stream = StringIO() expected_stream = StringIO() - pgb = ProgressBar(20,stream=pgb_stream) + pgb = ProgressBar(20, stream=pgb_stream) self.assertEqual(pgb_stream.getvalue(), expected_stream.getvalue()) # nothing print before refresh pgb.refresh() expected_stream.write("\r["+' '*20+"]") @@ -87,7 +87,7 @@ class ProgressBarTC(TestCase): def test_refresh_g_size(self): pgb_stream = StringIO() expected_stream = StringIO() - pgb = ProgressBar(20,35,stream=pgb_stream) + pgb = ProgressBar(20, 35, stream=pgb_stream) pgb.refresh() expected_stream.write("\r["+' '*35+"]") self.assertEqual(pgb_stream.getvalue(), expected_stream.getvalue()) @@ -95,7 +95,7 @@ class ProgressBarTC(TestCase): def test_refresh_l_size(self): pgb_stream = StringIO() expected_stream = StringIO() - pgb = ProgressBar(20,3,stream=pgb_stream) + pgb = ProgressBar(20, 3, stream=pgb_stream) pgb.refresh() expected_stream.write("\r["+' '*3+"]") self.assertEqual(pgb_stream.getvalue(), expected_stream.getvalue()) @@ -121,25 +121,25 @@ class ProgressBarTC(TestCase): self.assertEqual(pgb_stream.getvalue(), expected_stream.getvalue()) def test_default(self): - self._update_test(20, xrange(1,21)) + self._update_test(20, xrange(1, 21)) def test_nbops_gt_size(self): """Test the progress bar for nbops > size""" def half(total): - for counter in range(1,total+1): + for counter in range(1, total+1): yield counter // 2 self._update_test(40, half(40)) def test_nbops_lt_size(self): """Test the progress bar for nbops < size""" def double(total): - for counter in range(1,total+1): + for counter in range(1, total+1): yield counter * 2 self._update_test(10, double(10)) def test_nbops_nomul_size(self): """Test the progress bar for size % nbops !=0 (non int number of dots per update)""" - self._update_test(3, (6,13,20)) + self._update_test(3, (6, 13, 20)) def test_overflow(self): self._update_test(5, (8, 16, 25, 33, 42, (42, True)), size=42) @@ -195,43 +195,43 @@ class RawInputTC(TestCase): def test_ask_default(self): self.input_answer = '' - answer = self.qa.ask('text', ('yes','no'), 'yes') + answer = self.qa.ask('text', ('yes', 'no'), 'yes') self.assertEqual(answer, 'yes') self.input_answer = ' ' - answer = self.qa.ask('text', ('yes','no'), 'yes') + answer = self.qa.ask('text', ('yes', 'no'), 'yes') self.assertEqual(answer, 'yes') def test_ask_case(self): self.input_answer = 'no' - answer = self.qa.ask('text', ('yes','no'), 'yes') + answer = self.qa.ask('text', ('yes', 'no'), 'yes') self.assertEqual(answer, 'no') self.input_answer = 'No' - answer = self.qa.ask('text', ('yes','no'), 'yes') + answer = self.qa.ask('text', ('yes', 'no'), 'yes') self.assertEqual(answer, 'no') self.input_answer = 'NO' - answer = self.qa.ask('text', ('yes','no'), 'yes') + answer = self.qa.ask('text', ('yes', 'no'), 'yes') self.assertEqual(answer, 'no') self.input_answer = 'nO' - answer = self.qa.ask('text', ('yes','no'), 'yes') + answer = self.qa.ask('text', ('yes', 'no'), 'yes') self.assertEqual(answer, 'no') self.input_answer = 'YES' - answer = self.qa.ask('text', ('yes','no'), 'yes') + answer = self.qa.ask('text', ('yes', 'no'), 'yes') self.assertEqual(answer, 'yes') def test_ask_prompt(self): self.input_answer = '' - answer = self.qa.ask('text', ('yes','no'), 'yes') + answer = self.qa.ask('text', ('yes', 'no'), 'yes') self.assertEqual(self.input_args[0], 'text [Y(es)/n(o)]: ') - answer = self.qa.ask('text', ('y','n'), 'y') + answer = self.qa.ask('text', ('y', 'n'), 'y') self.assertEqual(self.input_args[0], 'text [Y/n]: ') - answer = self.qa.ask('text', ('n','y'), 'y') + answer = self.qa.ask('text', ('n', 'y'), 'y') self.assertEqual(self.input_args[0], 'text [n/Y]: ') - answer = self.qa.ask('text', ('yes','no','maybe','1'), 'yes') + answer = self.qa.ask('text', ('yes', 'no', 'maybe', '1'), 'yes') self.assertEqual(self.input_args[0], 'text [Y(es)/n(o)/m(aybe)/1]: ') def test_ask_ambiguous(self): self.input_answer = 'y' - self.assertRaises(Exception, self.qa.ask, 'text', ('yes','yep'), 'yes') + self.assertRaises(Exception, self.qa.ask, 'text', ('yes', 'yep'), 'yes') def test_confirm(self): self.input_answer = 'y' diff --git a/test/unittest_table.py b/test/unittest_table.py index 883686e..0ad6cb9 100644 --- a/test/unittest_table.py +++ b/test/unittest_table.py @@ -47,22 +47,22 @@ class TableTC(TestCase): tab.append_row([1]) self.assertEqual(tab, [[1]]) tab.append_row([2]) - self.assertEqual(tab[0,0], 1) - self.assertEqual(tab[1,0], 2) + self.assertEqual(tab[0, 0], 1) + self.assertEqual(tab[1, 0], 2) def test_valeur_ligne(self): tab = Table() - tab.create_columns(['col1','col2']) - tab.append_row([1,2]) - self.assertEqual(tab, [[1,2]]) + tab.create_columns(['col1', 'col2']) + tab.append_row([1, 2]) + self.assertEqual(tab, [[1, 2]]) def test_valeur_colonne(self): tab = Table() tab.create_columns(['col1']) tab.append_row([1]) tab.append_row([2]) - self.assertEqual(tab, [[1],[2]]) - self.assertEqual(tab[:,0], [1,2]) + self.assertEqual(tab, [[1], [2]]) + self.assertEqual(tab[:, 0], [1, 2]) def test_indexation(self): """we should be able to use [] to access rows""" @@ -85,9 +85,9 @@ class TableTC(TestCase): def test_get_cells(self): self.table.insert_column(1, range(3), 'supp') - self.assertEqual(self.table[0,1], 0) - self.assertEqual(self.table[1,1], 1) - self.assertEqual(self.table[2,1], 2) + self.assertEqual(self.table[0, 1], 0) + self.assertEqual(self.table[1, 1], 1) + self.assertEqual(self.table[2, 1], 2) self.assertEqual(self.table['row1', 'supp'], 0) self.assertEqual(self.table['row2', 'supp'], 1) self.assertEqual(self.table['row3', 'supp'], 2) @@ -104,29 +104,29 @@ class TableTC(TestCase): """Tests that table.set_column() works fine. """ self.table.set_column(0, range(3)) - self.assertEqual(self.table[0,0], 0) - self.assertEqual(self.table[1,0], 1) - self.assertEqual(self.table[2,0], 2) + self.assertEqual(self.table[0, 0], 0) + self.assertEqual(self.table[1, 0], 1) + self.assertEqual(self.table[2, 0], 2) def test_set_column_by_id(self): """Tests that table.set_column_by_id() works fine. """ self.table.set_column_by_id('col1', range(3)) - self.assertEqual(self.table[0,0], 0) - self.assertEqual(self.table[1,0], 1) - self.assertEqual(self.table[2,0], 2) + self.assertEqual(self.table[0, 0], 0) + self.assertEqual(self.table[1, 0], 1) + self.assertEqual(self.table[2, 0], 2) self.assertRaises(KeyError, self.table.set_column_by_id, 'col123', range(3)) def test_cells_ids(self): """tests that we can access cells by giving row/col ids""" self.assertRaises(KeyError, self.table.set_cell_by_ids, 'row12', 'col1', 12) self.assertRaises(KeyError, self.table.set_cell_by_ids, 'row1', 'col12', 12) - self.assertEqual(self.table[0,0], 0) + self.assertEqual(self.table[0, 0], 0) self.table.set_cell_by_ids('row1', 'col1', 'DATA') - self.assertEqual(self.table[0,0], 'DATA') + self.assertEqual(self.table[0, 0], 'DATA') self.assertRaises(KeyError, self.table.set_row_by_id, 'row12', []) self.table.set_row_by_id('row1', ['1.0', '1.1']) - self.assertEqual(self.table[0,0], '1.0') + self.assertEqual(self.table[0, 0], '1.0') def test_insert_row(self): """tests a row insertion""" @@ -144,21 +144,21 @@ class TableTC(TestCase): """ self.table.set_cell(0, 1, 12) self.table.set_cell(2, 1, 13) - self.assertEqual(self.table[:,1], [12,0,13]) - self.assertEqual(self.table[:,'col2'], [12,0,13]) + self.assertEqual(self.table[:, 1], [12, 0, 13]) + self.assertEqual(self.table[:, 'col2'], [12, 0, 13]) def test_get_columns(self): """Tests if table.get_columns() works fine. """ self.table.set_cell(0, 1, 12) self.table.set_cell(2, 1, 13) - self.assertEqual(self.table.get_columns(), [[0,0,0], [12,0,13]]) + self.assertEqual(self.table.get_columns(), [[0, 0, 0], [12, 0, 13]]) def test_insert_column(self): """Tests that table.insert_column() works fine. """ self.table.insert_column(1, range(3), "inserted_column") - self.assertEqual(self.table[:,1], [0,1,2]) + self.assertEqual(self.table[:, 1], [0, 1, 2]) self.assertEqual(self.table.col_names, ['col1', 'inserted_column', 'col2']) @@ -167,7 +167,7 @@ class TableTC(TestCase): """ self.table.delete_column(1) self.assertEqual(self.table.col_names, ['col1']) - self.assertEqual(self.table[:,0], [0,0,0]) + self.assertEqual(self.table[:, 0], [0, 0, 0]) self.assertRaises(KeyError, self.table.delete_column_by_id, 'col2') self.table.delete_column_by_id('col1') self.assertEqual(self.table.col_names, []) @@ -175,11 +175,11 @@ class TableTC(TestCase): def test_transpose(self): """Tests that table.transpose() works fine. """ - self.table.append_column(range(5,8), 'col3') + self.table.append_column(range(5, 8), 'col3') ttable = self.table.transpose() self.assertEqual(ttable.row_names, ['col1', 'col2', 'col3']) self.assertEqual(ttable.col_names, ['row1', 'row2', 'row3']) - self.assertEqual(ttable.data, [[0,0,0], [0,0,0], [5,6,7]]) + self.assertEqual(ttable.data, [[0, 0, 0], [0, 0, 0], [5, 6, 7]]) def test_sort_table(self): """Tests the table sort by column @@ -273,7 +273,7 @@ class TableStyleSheetTC(TestCase): """ self.table = Table() self.table.create_row('row1') - self.table.create_columns(['a','b','c']) + self.table.create_columns(['a', 'b', 'c']) self.stylesheet = TableStyleSheet() # We don't want anything to be printed self.stdout_backup = sys.stdout @@ -287,9 +287,9 @@ class TableStyleSheetTC(TestCase): """ rule = '0_2 = sqrt(0_0**2 + 0_1**2)' self.stylesheet.add_rule(rule) - self.table.set_row(0, [3,4,0]) + self.table.set_row(0, [3, 4, 0]) self.table.apply_stylesheet(self.stylesheet) - self.assertEqual(self.table[0], [3,4,5]) + self.assertEqual(self.table[0], [3, 4, 5]) self.assertEqual(len(self.stylesheet.rules), 1) self.stylesheet.add_rule('some bad rule with bad syntax') self.assertEqual(len(self.stylesheet.rules), 1, "Ill-formed rule mustn't be added") @@ -305,44 +305,44 @@ class TableStyleSheetTC(TestCase): def test_rowavg_rule(self): """Tests that add_rowavg_rule works as expected """ - self.table.set_row(0, [10,20,0]) - self.stylesheet.add_rowavg_rule((0,2), 0, 0, 1) + self.table.set_row(0, [10, 20, 0]) + self.stylesheet.add_rowavg_rule((0, 2), 0, 0, 1) self.table.apply_stylesheet(self.stylesheet) - val = self.table[0,2] + val = self.table[0, 2] self.assert_(int(val) == 15) def test_rowsum_rule(self): """Tests that add_rowsum_rule works as expected """ - self.table.set_row(0, [10,20,0]) - self.stylesheet.add_rowsum_rule((0,2), 0, 0, 1) + self.table.set_row(0, [10, 20, 0]) + self.stylesheet.add_rowsum_rule((0, 2), 0, 0, 1) self.table.apply_stylesheet(self.stylesheet) - val = self.table[0,2] + val = self.table[0, 2] self.assert_(val == 30) def test_colavg_rule(self): """Tests that add_colavg_rule works as expected """ - self.table.set_row(0, [10,20,0]) - self.table.append_row([12,8,3], 'row2') + self.table.set_row(0, [10, 20, 0]) + self.table.append_row([12, 8, 3], 'row2') self.table.create_row('row3') - self.stylesheet.add_colavg_rule((2,0), 0, 0, 1) + self.stylesheet.add_colavg_rule((2, 0), 0, 0, 1) self.table.apply_stylesheet(self.stylesheet) - val = self.table[2,0] + val = self.table[2, 0] self.assert_(int(val) == 11) def test_colsum_rule(self): """Tests that add_colsum_rule works as expected """ - self.table.set_row(0, [10,20,0]) - self.table.append_row([12,8,3], 'row2') + self.table.set_row(0, [10, 20, 0]) + self.table.append_row([12, 8, 3], 'row2') self.table.create_row('row3') - self.stylesheet.add_colsum_rule((2,0), 0, 0, 1) + self.stylesheet.add_colsum_rule((2, 0), 0, 0, 1) self.table.apply_stylesheet(self.stylesheet) - val = self.table[2,0] + val = self.table[2, 0] self.assert_(val == 22) diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py index 2bb09a5..c497ae8 100644 --- a/test/unittest_testlib.py +++ b/test/unittest_testlib.py @@ -82,7 +82,7 @@ class TestlibTC(TestCase): capture = True - def mkdir(self,path): + def mkdir(self, path): if not exists(path): self._dirs.add(path) os.mkdir(path) @@ -199,7 +199,7 @@ class TestlibTC(TestCase): ed1 = join(dirname(__file__), 'data', 'empty_dir_1') ed2 = join(dirname(__file__), 'data', 'empty_dir_2') - for path in (ed1, ed2, join(subdir_differ,'unexpected')): + for path in (ed1, ed2, join(subdir_differ, 'unexpected')): self.mkdir(path) self.assertDirEquals(ed1, ed2) @@ -289,13 +289,13 @@ class TestlibTC(TestCase): def test_is(self): obj_1 = [] obj_2 = [] - self.assertIs(obj_1,obj_1) + self.assertIs(obj_1, obj_1) self.assertRaises(AssertionError, self.assertIs, obj_1, obj_2) def test_isnot(self): obj_1 = [] obj_2 = [] - self.assertIsNot(obj_1,obj_2) + self.assertIsNot(obj_1, obj_2) self.assertRaises(AssertionError, self.assertIsNot, obj_1, obj_1) def test_none(self): @@ -743,7 +743,7 @@ class DecoratorTC(TestCase): tempdir = tempfile.gettempdir() # assert temp directory is empty self.assertListEqual(list(os.walk(tempdir)), - [(tempdir,[],[])]) + [(tempdir, [], [])]) witness = [] @@ -766,7 +766,7 @@ class DecoratorTC(TestCase): # assert temp directory is empty self.assertListEqual(list(os.walk(tempdir)), - [(tempdir,[],[])]) + [(tempdir, [], [])]) @with_tempdir def test_tmp_dir_normal_2(self): @@ -774,7 +774,7 @@ class DecoratorTC(TestCase): tempdir = tempfile.gettempdir() # assert temp directory is empty self.assertListEqual(list(os.walk(tempfile.tempdir)), - [(tempfile.tempdir,[],[])]) + [(tempfile.tempdir, [], [])]) class WitnessException(Exception): @@ -798,7 +798,7 @@ class DecoratorTC(TestCase): # assert temp directory is empty self.assertListEqual(list(os.walk(tempdir)), - [(tempdir,[],[])]) + [(tempdir, [], [])]) def setUp(self): self.pyversion = sys.version_info @@ -902,7 +902,7 @@ class TagTC(TestCase): self.assertEqual(bob(2, 3, 7), 35) self.assertTrue(hasattr(bob, 'tags')) - self.assertSetEqual(bob.tags, set(['testing','bob'])) + self.assertSetEqual(bob.tags, set(['testing', 'bob'])) def test_tags_class(self): diff --git a/test/unittest_textutils.py b/test/unittest_textutils.py index e4dd966..75b9cbb 100644 --- a/test/unittest_textutils.py +++ b/test/unittest_textutils.py @@ -124,9 +124,9 @@ class UnitsTC(TestCase): def setUp(self): self.units = { - 'm':60, - 'kb':1024, - 'mb':1024*1024, + 'm': 60, + 'kb': 1024, + 'mb': 1024*1024, } def test_empty_base(self): @@ -141,10 +141,10 @@ class UnitsTC(TestCase): def test_empty_final(self): # int('12.4') raise value error - self.assertRaises(ValueError, tu.apply_units,'12.4', {}, final=int) + self.assertRaises(ValueError, tu.apply_units, '12.4', {}, final=int) def test_empty_inter_final(self): - result = tu.apply_units('12.4', {}, inter=float,final=int) + result = tu.apply_units('12.4', {}, inter=float, final=int) self.assertEqual(result, 12) self.assertIsInstance(result, int) @@ -161,7 +161,7 @@ class UnitsTC(TestCase): self.assertEqual(result, 4298.42) def test_blank_mixed(self): - result = tu.apply_units('45, 317, 337', {},final=int) + result = tu.apply_units('45, 317, 337', {}, final=int) self.assertEqual(result, 45317337) def test_unit_singleunit_singleletter(self): diff --git a/test/unittest_tree.py b/test/unittest_tree.py index 7ac476d..3cfcdd8 100644 --- a/test/unittest_tree.py +++ b/test/unittest_tree.py @@ -114,21 +114,21 @@ class Node_ClassTest(TestCase): return depth of this node in the tree """ self.assertEqual(self.o.depth_down(), 4) - self.assertEqual(self.o.get_child_by_id('child_2_1',True).depth_down(), 1) + self.assertEqual(self.o.get_child_by_id('child_2_1', True).depth_down(), 1) def test_known_values_depth(self): """ return depth of this node in the tree """ self.assertEqual(self.o.depth(), 0) - self.assertEqual(self.o.get_child_by_id('child_2_1',True).depth(), 2) + self.assertEqual(self.o.get_child_by_id('child_2_1', True).depth(), 2) def test_known_values_width(self): """ return depth of this node in the tree """ self.assertEqual(self.o.width(), 3) - self.assertEqual(self.o.get_child_by_id('child_2_1',True).width(), 1) + self.assertEqual(self.o.get_child_by_id('child_2_1', True).width(), 1) def test_known_values_root(self): """ @@ -140,15 +140,15 @@ class Node_ClassTest(TestCase): """ return a list with all the leaf nodes descendant from this task """ - self.assertEqual(self.o.leaves(), [self.o.get_child_by_id('child_2_1',True), - self.o.get_child_by_id('child_3_1',True), - self.o.get_child_by_id('child_2_3',True)]) + self.assertEqual(self.o.leaves(), [self.o.get_child_by_id('child_2_1', True), + self.o.get_child_by_id('child_3_1', True), + self.o.get_child_by_id('child_2_3', True)]) def test_known_values_lineage(self): - c31 = self.o.get_child_by_id('child_3_1',True) - self.assertEqual(c31.lineage(), [self.o.get_child_by_id('child_3_1',True), - self.o.get_child_by_id('child_2_2',True), - self.o.get_child_by_id('child_1_1',True), + c31 = self.o.get_child_by_id('child_3_1', True) + self.assertEqual(c31.lineage(), [self.o.get_child_by_id('child_3_1', True), + self.o.get_child_by_id('child_2_2', True), + self.o.get_child_by_id('child_1_1', True), self.o]) diff --git a/test/utils.py b/test/utils.py index 598d386..73b362b 100644 --- a/test/utils.py +++ b/test/utils.py @@ -74,7 +74,7 @@ class WriterTC: def test_advanced_table(self): table = Table(cols=2, klass='whatever', id='mytable', rheaders=1) - for field, value in (('field', 'value') ,('f1', 'v1'), ('f22', 'v22'), ('f333', 'v333')): + for field, value in (('field', 'value'), ('f1', 'v1'), ('f22', 'v22'), ('f333', 'v333')): table.append(Text(field)) table.append(Text(value)) table.append(Link('http://www.perdu.com', 'toi perdu ?')) @@ -564,7 +564,7 @@ class SkipAwareTextTestRunner(unittest.TextTestRunner): det_results = [] for name, value in (("failures", result.failures), - ("errors",result.errors), + ("errors", result.errors), ("skipped", result.skipped)): if value: det_results.append("%s=%i" % (name, len(value))) @@ -1201,7 +1201,7 @@ class TestCase(unittest.TestCase): restartfile.close() except Exception, ex: print >> sys.__stderr__, "Error while saving \ -succeeded test into", osp.join(os.getcwd(),FILE_RESTART) +succeeded test into", osp.join(os.getcwd(), FILE_RESTART) raise ex result.addSuccess(self) finally: @@ -1332,9 +1332,9 @@ succeeded test into", osp.join(os.getcwd(),FILE_RESTART) got_count = {} expected_count = {} for element in got: - got_count[element] = got_count.get(element,0) + 1 + got_count[element] = got_count.get(element, 0) + 1 for element in expected: - expected_count[element] = expected_count.get(element,0) + 1 + expected_count[element] = expected_count.get(element, 0) + 1 # we know that got_count.key() == expected_count.key() # because of assertSetEqual for element, count in got_count.iteritems(): @@ -1362,14 +1362,14 @@ succeeded test into", osp.join(os.getcwd(),FILE_RESTART) warnings.warn("the assertSetEquals function if now intended for set only."\ "use assertUnorderedIterableEquals instead.", DeprecationWarning, 2) - return self.assertUnorderedIterableEquals(got,expected, msg) + return self.assertUnorderedIterableEquals(got, expected, msg) items={} items['missing'] = expected - got items['unexpected'] = got - expected if any(items.itervalues()): if msg is None: - msg = '\n'.join('%s:\n\t%s' % (key,"\n\t".join(str(value) for value in values)) + msg = '\n'.join('%s:\n\t%s' % (key, "\n\t".join(str(value) for value in values)) for key, values in items.iteritems() if values) self.fail(msg) @@ -1647,7 +1647,7 @@ succeeded test into", osp.join(os.getcwd(),FILE_RESTART) for name, items in errors.iteritems() if items] if msgs: - msgs.insert(0,"%s and %s differ :" % ( + msgs.insert(0, "%s and %s differ :" % ( osp.join(path_a, ipath_a), osp.join(path_b, ipath_b), )) @@ -1854,7 +1854,7 @@ class MockConfigParser(ConfigParser): for section, pairs in options.iteritems(): self.add_section(section) for key, value in pairs.iteritems(): - self.set(section,key,value) + self.set(section, key, value) def write(self, _): raise NotImplementedError() diff --git a/textutils.py b/textutils.py index 9fb59bb..5019ebe 100644 --- a/textutils.py +++ b/textutils.py @@ -302,7 +302,7 @@ _BLANK_URE = r'(\s|,)+' _BLANK_RE = re.compile(_BLANK_URE) __VALUE_URE = r'-?(([0-9]+\.[0-9]*)|((0x?)?[0-9]+))' __UNITS_URE = r'[a-zA-Z]+' -_VALUE_RE = re.compile(r'(?P<value>%s)(?P<unit>%s)?'%(__VALUE_URE,__UNITS_URE)) +_VALUE_RE = re.compile(r'(?P<value>%s)(?P<unit>%s)?'%(__VALUE_URE, __UNITS_URE)) BYTE_UNITS = { "b": 1, @@ -342,7 +342,7 @@ def apply_units( string, units, inter=None, final=float, blank_reg=_BLANK_RE, """ if inter is None: inter = final - string = _BLANK_RE.sub('',string) + string = _BLANK_RE.sub('', string) values = [] for match in value_reg.finditer(string): dic = match.groupdict() @@ -421,24 +421,24 @@ ANSI_PREFIX = '\033[' ANSI_END = 'm' ANSI_RESET = '\033[0m' ANSI_STYLES = { - 'reset' : "0", - 'bold' : "1", - 'italic' : "3", - 'underline' : "4", - 'blink' : "5", - 'inverse' : "7", - 'strike' : "9", + 'reset': "0", + 'bold': "1", + 'italic': "3", + 'underline': "4", + 'blink': "5", + 'inverse': "7", + 'strike': "9", } ANSI_COLORS = { - 'reset' : "0", - 'black' : "30", - 'red' : "31", - 'green' : "32", - 'yellow' : "33", - 'blue' : "34", - 'magenta' : "35", - 'cyan' : "36", - 'white' : "37", + 'reset': "0", + 'black': "30", + 'red': "31", + 'green': "32", + 'yellow': "33", + 'blue': "34", + 'magenta': "35", + 'cyan': "36", + 'white': "37", } def _get_ansi_code(color=None, style=None): @@ -466,7 +466,7 @@ def _get_ansi_code(color=None, style=None): ansi_code.append(ANSI_STYLES[effect]) if color: if color.isdigit(): - ansi_code.extend(['38','5']) + ansi_code.extend(['38', '5']) ansi_code.append(color) else: ansi_code.append(ANSI_COLORS[color]) diff --git a/vcgutils.py b/vcgutils.py index 93b570d..cf19394 100644 --- a/vcgutils.py +++ b/vcgutils.py @@ -34,11 +34,11 @@ import string ATTRS_VAL = { 'algos': ('dfs', 'tree', 'minbackward', - 'left_to_right','right_to_left', - 'top_to_bottom','bottom_to_top', + 'left_to_right', 'right_to_left', + 'top_to_bottom', 'bottom_to_top', 'maxdepth', 'maxdepthslow', 'mindepth', 'mindepthslow', 'mindegree', 'minindegree', 'minoutdegree', - 'maxdegree','maxindegree', 'maxoutdegree'), + 'maxdegree', 'maxindegree', 'maxoutdegree'), 'booleans': ('yes', 'no'), 'colors': ('black', 'white', 'blue', 'red', 'green', 'yellow', 'magenta', 'lightgrey', @@ -59,8 +59,8 @@ ATTRS_VAL = { # 1 -> int # list -> value in list GRAPH_ATTRS = { - 'title' : 0, - 'label' : 0, + 'title': 0, + 'label': 0, 'color': ATTRS_VAL['colors'], 'textcolor': ATTRS_VAL['colors'], 'bordercolor': ATTRS_VAL['colors'], @@ -76,10 +76,10 @@ GRAPH_ATTRS = { 'horizontal_order': 1, 'xspace': 1, 'yspace': 1, - 'layoutalgorithm' : ATTRS_VAL['algos'], - 'late_edge_labels' : ATTRS_VAL['booleans'], + 'layoutalgorithm': ATTRS_VAL['algos'], + 'late_edge_labels': ATTRS_VAL['booleans'], 'display_edge_labels': ATTRS_VAL['booleans'], - 'dirty_edge_labels' : ATTRS_VAL['booleans'], + 'dirty_edge_labels': ATTRS_VAL['booleans'], 'finetuning': ATTRS_VAL['booleans'], 'manhattan_edges': ATTRS_VAL['booleans'], 'smanhattan_edges': ATTRS_VAL['booleans'], @@ -89,8 +89,8 @@ GRAPH_ATTRS = { 'splines': ATTRS_VAL['booleans'], } NODE_ATTRS = { - 'title' : 0, - 'label' : 0, + 'title': 0, + 'label': 0, 'color': ATTRS_VAL['colors'], 'textcolor': ATTRS_VAL['colors'], 'bordercolor': ATTRS_VAL['colors'], @@ -105,12 +105,12 @@ NODE_ATTRS = { 'horizontal_order': 1, } EDGE_ATTRS = { - 'sourcename' : 0, - 'targetname' : 0, - 'label' : 0, - 'linestyle' : ATTRS_VAL['linestyles'], - 'class' : 1, - 'thickness' : 0, + 'sourcename': 0, + 'targetname': 0, + 'label': 0, + 'linestyle': ATTRS_VAL['linestyles'], + 'class': 1, + 'thickness': 0, 'color': ATTRS_VAL['colors'], 'textcolor': ATTRS_VAL['colors'], 'arrowcolor': ATTRS_VAL['colors'], |