Changeset 04a5204 in rtems-tools for rtemstoolkit
- Timestamp:
- 11/12/15 10:15:23 (8 years ago)
- Branches:
- 4.10, 5, master
- Children:
- c9fa179
- Parents:
- ab922fe
- Location:
- rtemstoolkit
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
rtemstoolkit/check.py
rab922fe r04a5204 156 156 log.notice('RTEMS Source Builder - Check, v%s' % (version.str())) 157 157 if host_setup(_opts): 158 print 'Environment is ok'158 print('Environment is ok') 159 159 else: 160 print 'Environment is not correctly set up'161 except error.general ,gerr:162 print gerr160 print('Environment is not correctly set up') 161 except error.general as gerr: 162 print(gerr) 163 163 sys.exit(1) 164 except error.internal ,ierr:165 print ierr164 except error.internal as ierr: 165 print (ierr) 166 166 sys.exit(1) 167 except error.exit , eerr:167 except error.exit: 168 168 pass 169 169 except KeyboardInterrupt: -
rtemstoolkit/config.py
rab922fe r04a5204 49 49 import path 50 50 except KeyboardInterrupt: 51 print 'user terminated'51 print('user terminated') 52 52 sys.exit(1) 53 53 except: 54 print 'error: unknown application load error'54 print('error: unknown application load error') 55 55 sys.exit(1) 56 56 … … 138 138 trace_me = False 139 139 if trace_me: 140 print '------------------------------------------------------'140 print('------------------------------------------------------') 141 141 macros = [] 142 142 nesting = [] … … 145 145 while c < len(s): 146 146 if trace_me: 147 print 'ms:', c, '"' + s[c:] + '"', has_braces, len(nesting), nesting147 print('ms:', c, '"' + s[c:] + '"', has_braces, len(nesting), nesting) 148 148 # 149 149 # We need to watch for shell type variables or the form '${var}' because … … 193 193 c += 1 194 194 if trace_me: 195 print 'ms:', macros195 print('ms:', macros) 196 196 if trace_me: 197 print '-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-='197 print('-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=') 198 198 return macros 199 199 … … 751 751 log.trace('config: %s: _open: %s' % (self.init_name, path.host(configname))) 752 752 config = open(path.host(configname), 'r') 753 except IOError ,err:753 except IOError as err: 754 754 raise error.general('error opening config file: %s' % (path.host(configname))) 755 755 self.configpath += [configname] … … 841 841 for config_file in opts.config_files(): 842 842 s = file(config_file, opts) 843 print s843 print(s) 844 844 del s 845 except error.general ,gerr:846 print gerr845 except error.general as gerr: 846 print(gerr) 847 847 sys.exit(1) 848 except error.internal ,ierr:849 print ierr848 except error.internal as ierr: 849 print(ierr) 850 850 sys.exit(1) 851 851 except KeyboardInterrupt: -
rtemstoolkit/error.py
rab922fe r04a5204 58 58 try: 59 59 raise general('a general error') 60 except general ,gerr:61 print 'caught:', gerr60 except general as gerr: 61 print('caught:', gerr) 62 62 try: 63 63 raise internal('an internal error') 64 except internal ,ierr:65 print 'caught:', ierr64 except internal as ierr: 65 print('caught:', ierr) -
rtemstoolkit/execute.py
rab922fe r04a5204 128 128 is a timeout check.""" 129 129 if trace_threads: 130 print 'executte:_writethread: start'130 print('executte:_writethread: start') 131 131 try: 132 132 while True: … … 143 143 except: 144 144 if trace_threads: 145 print 'executte:_writethread: exception'145 print('executte:_writethread: exception') 146 146 pass 147 147 try: … … 150 150 pass 151 151 if trace_threads: 152 print 'executte:_writethread: finished'152 print('executte:_writethread: finished') 153 153 154 154 def _readthread(exe, fh, out, prefix = ''): … … 168 168 169 169 if trace_threads: 170 print 'executte:_readthread: start'170 print('executte:_readthread: start') 171 171 count = 0 172 172 line = '' … … 188 188 raise 189 189 if trace_threads: 190 print 'executte:_readthread: exception'190 print('executte:_readthread: exception') 191 191 pass 192 192 try: … … 197 197 _output_line(line, exe, prefix, out, 100) 198 198 if trace_threads: 199 print 'executte:_readthread: finished'199 print('executte:_readthread: finished') 200 200 201 201 def _timerthread(exe, interval, function): … … 346 346 if self.verbose: 347 347 log.output('exit: ' + str(exit_code)) 348 except OSError ,ose:348 except OSError as ose: 349 349 exit_code = ose.errno 350 350 if self.verbose: … … 454 454 try: 455 455 if self.proc is not None: 456 print "sending sig"456 print("sending sig") 457 457 self.proc.send_signal(signal) 458 458 except: … … 518 518 capture = False, stdin = subprocess.PIPE) 519 519 if ec == 0: 520 print 521 commands['pipe'][2] 520 print('piping input into ' + commands['pipe'][0] + ': ' + \ 521 commands['pipe'][2]) 522 522 proc.stdin.write(commands['pipe'][2]) 523 523 proc.stdin.close() … … 545 545 commands['unix']['pipe'] = ('grep', 'hello', 'hello world') 546 546 547 print arg_list('cmd a1 a2 "a3 is a string" a4')548 print arg_list('cmd b1 b2 "b3 is a string a4')549 print 550 ['subst0', 'subst1', 'subst2']) 547 print(arg_list('cmd a1 a2 "a3 is a string" a4')) 548 print(arg_list('cmd b1 b2 "b3 is a string a4')) 549 print(arg_subst(['nothing', 'xx-%0-yyy', '%1', '%2-something'], 550 ['subst0', 'subst1', 'subst2'])) 551 551 552 552 e = execute(error_prefix = 'ERR: ', verbose = True) -
rtemstoolkit/git.py
rab922fe r04a5204 193 193 opts = options.load(sys.argv) 194 194 g = repo('.', opts) 195 print g.git_version()196 print g.valid()197 print g.status()198 print g.clean()199 print g.remotes()200 print g.email()201 print g.head()195 print(g.git_version()) 196 print(g.valid()) 197 print(g.status()) 198 print(g.clean()) 199 print(g.remotes()) 200 print(g.email()) 201 print(g.head()) -
rtemstoolkit/log.py
rab922fe r04a5204 75 75 lock.acquire() 76 76 for l in text.replace(chr(13), '').splitlines(): 77 print l77 print(l) 78 78 lock.release() 79 79 … … 93 93 lock.acquire() 94 94 for l in text.replace(chr(13), '').splitlines(): 95 print l95 print(l) 96 96 lock.release() 97 97 if not stdout_only: … … 128 128 try: 129 129 self.fhs.append(file(s, 'w')) 130 except IOError ,ioe:130 except IOError as ioe: 131 131 raise error.general("creating log file '" + s + \ 132 132 "': " + str(ioe)) … … 187 187 l.output('log: hello world NONE') 188 188 l.flush() 189 print '=-' * 40190 print 'tail: %d' % (len(l.tail))191 print l192 print '=-' * 40189 print('=-' * 40) 190 print('tail: %d' % (len(l.tail))) 191 print(l) 192 print('=-' * 40) 193 193 for i in range(0, 10): 194 194 l.output('log: hello world 2: %d\n' % (i)) 195 195 l.flush() 196 print '=-' * 40197 print 'tail: %d' % (len(l.tail))198 print l199 print '=-' * 40196 print('=-' * 40) 197 print('tail: %d' % (len(l.tail))) 198 print(l) 199 print('=-' * 40) 200 200 for i in [0, 1]: 201 201 quiet = False 202 202 tracing = False 203 print '- quiet:%s - trace:%s %s' % (str(quiet), str(tracing), '-' * 30)203 print('- quiet:%s - trace:%s %s' % (str(quiet), str(tracing), '-' * 30)) 204 204 trace('trace with quiet and trace off') 205 205 notice('notice with quiet and trace off') 206 206 quiet = True 207 207 tracing = False 208 print '- quiet:%s - trace:%s %s' % (str(quiet), str(tracing), '-' * 30)208 print('- quiet:%s - trace:%s %s' % (str(quiet), str(tracing), '-' * 30)) 209 209 trace('trace with quiet on and trace off') 210 210 notice('notice with quiet on and trace off') 211 211 quiet = False 212 212 tracing = True 213 print '- quiet:%s - trace:%s %s' % (str(quiet), str(tracing), '-' * 30)213 print('- quiet:%s - trace:%s %s' % (str(quiet), str(tracing), '-' * 30)) 214 214 trace('trace with quiet off and trace on') 215 215 notice('notice with quiet off and trace on') 216 216 quiet = True 217 217 tracing = True 218 print '- quiet:%s - trace:%s %s' % (str(quiet), str(tracing), '-' * 30)218 print('- quiet:%s - trace:%s %s' % (str(quiet), str(tracing), '-' * 30)) 219 219 trace('trace with quiet on and trace on') 220 220 notice('notice with quiet on and trace on') 221 221 default = l 222 print '=-' * 40223 print 'tail: %d' % (len(l.tail))224 print l225 print '=-' * 40222 print('=-' * 40) 223 print('tail: %d' % (len(l.tail))) 224 print(l) 225 print('=-' * 40) 226 226 del l -
rtemstoolkit/macros.py
rab922fe r04a5204 240 240 trace_me = False 241 241 if trace_me: 242 print '[[[[]]]] parsing macros'242 print('[[[[]]]] parsing macros') 243 243 orig_macros = copy.copy(self.macros) 244 244 map = 'global' … … 255 255 for c in l: 256 256 if trace_me: 257 print 258 (c, ord(c), state, token, macro, map) 257 print(']]]]]]]] c:%s(%d) s:%s t:"%s" m:%r M:%s' % \ 258 (c, ord(c), state, token, macro, map)) 259 259 l_remaining = l_remaining[1:] 260 260 if c is '#' and not state.startswith('value'): … … 379 379 self.files += [n] 380 380 return 381 except IOError ,err:381 except IOError as err: 382 382 pass 383 383 raise error.general('opening macro file: %s' % \ … … 491 491 import copy 492 492 import sys 493 print inspect.getfile(macros)493 print(inspect.getfile(macros)) 494 494 m = macros(name = 'defaults.mc') 495 495 d = copy.copy(m) 496 496 m['test1'] = 'something' 497 497 if d.has_key('test1'): 498 print 'error: copy failed.'498 print('error: copy failed.') 499 499 sys.exit(1) 500 500 m.parse("[test]\n" \ 501 501 "test1: none, undefine, ''\n" \ 502 502 "name: none, override, 'pink'\n") 503 print 'set test:', m.set_read_map('test')503 print('set test:', m.set_read_map('test')) 504 504 if m['name'] != 'pink': 505 print 'error: override failed. name is %s' % (m['name'])505 print('error: override failed. name is %s' % (m['name'])) 506 506 sys.exit(1) 507 507 if m.has_key('test1'): 508 print 'error: map undefine failed.'508 print('error: map undefine failed.') 509 509 sys.exit(1) 510 print 'unset test:', m.unset_read_map('test')511 print m512 print m.keys()510 print('unset test:', m.unset_read_map('test')) 511 print(m) 512 print(m.keys()) -
rtemstoolkit/mailer.py
rab922fe r04a5204 76 76 lines = mrc.readlines() 77 77 mrc.close() 78 except IOError ,err:78 except IOError as err: 79 79 raise error.general('error reading: %s' % (mailrc)) 80 80 for l in lines: … … 105 105 s = smtplib.SMTP(self.smtp_host()) 106 106 s.sendmail(from_addr, [to_addr], msg) 107 except smtplib.SMTPException ,se:107 except smtplib.SMTPException as se: 108 108 raise error.general('sending mail: %s' % (str(se))) 109 except socket.error ,se:109 except socket.error as se: 110 110 raise error.general('sending mail: %s' % (str(se))) 111 111 … … 116 116 opts = options.load(sys.argv, optargs = optargs, defaults = 'defaults.mc') 117 117 m = mail(opts) 118 print 'From: %s' % (m.from_address())119 print 'SMTP Host: %s' % (m.smtp_host())118 print('From: %s' % (m.from_address())) 119 print('SMTP Host: %s' % (m.smtp_host())) 120 120 m.send(m.from_address(), 'Test mailer.py', 'This is a test') -
rtemstoolkit/options.py
rab922fe r04a5204 274 274 275 275 def help(self): 276 print '%s: [options] [args]' % (self.command_name)277 print 'RTEMS Tools Project (c) 2012-2015 Chris Johns'278 print 'Options and arguments:'276 print('%s: [options] [args]' % (self.command_name)) 277 print('RTEMS Tools Project (c) 2012-2015 Chris Johns') 278 print('Options and arguments:') 279 279 opts = self.long_opts_help.keys() 280 280 if self.optargs: … … 288 288 else: 289 289 raise error.general('invalid help data: %s' %(o)) 290 print '%-*s : %s' % (indent, o, h)290 print('%-*s : %s' % (indent, o, h)) 291 291 raise error.exit() 292 292 … … 581 581 log.notice('Defaults:') 582 582 log.notice(str(opts.defaults)) 583 except error.general ,gerr:584 print gerr583 except error.general as gerr: 584 print(gerr) 585 585 sys.exit(1) 586 except error.internal ,ierr:587 print ierr586 except error.internal as ierr: 587 print(ierr) 588 588 sys.exit(1) 589 except error.exit , eerr:589 except error.exit: 590 590 pass 591 591 except KeyboardInterrupt: -
rtemstoolkit/path.py
rab922fe r04a5204 123 123 try: 124 124 os.makedirs(host(path)) 125 except IOError , err:126 raise error.general('cannot make directory: %s' % (path)) 127 except OSError , err:128 raise error.general('cannot make directory: %s' % (path)) 129 except WindowsError , err:125 except IOError: 126 raise error.general('cannot make directory: %s' % (path)) 127 except OSError: 128 raise error.general('cannot make directory: %s' % (path)) 129 except WindowsError: 130 130 raise error.general('cannot make directory: %s' % (path)) 131 131 else: 132 132 try: 133 133 os.makedirs(host(path)) 134 except IOError , err:135 raise error.general('cannot make directory: %s' % (path)) 136 except OSError , err:134 except IOError: 135 raise error.general('cannot make directory: %s' % (path)) 136 except OSError: 137 137 raise error.general('cannot make directory: %s' % (path)) 138 138 … … 140 140 141 141 def _onerror(function, path, excinfo): 142 print 'removeall error: (%s) %s' % (excinfo, path)142 print('removeall error: (%s) %s' % (excinfo, path)) 143 143 144 144 path = host(path) … … 209 209 else: 210 210 shutil.copy2(srcname, dstname) 211 except shutil.Error ,err:211 except shutil.Error as err: 212 212 raise error.general('copying tree: %s -> %s: %s' % (src, dst, str(err))) 213 except EnvironmentError ,why:213 except EnvironmentError as why: 214 214 raise error.general('copying tree: %s -> %s: %s' % (srcname, dstname, str(why))) 215 215 try: 216 216 shutil.copystat(src, dst) 217 except OSError ,why:217 except OSError as why: 218 218 ok = False 219 219 if windows: … … 224 224 225 225 if __name__ == '__main__': 226 print host('/a/b/c/d-e-f')227 print host('//a/b//c/d-e-f')228 print shell('/w/x/y/z')229 print basename('/as/sd/df/fg/me.txt')230 print dirname('/as/sd/df/fg/me.txt')231 print join('/d', 'g', '/tyty/fgfg')226 print(host('/a/b/c/d-e-f')) 227 print(host('//a/b//c/d-e-f')) 228 print(shell('/w/x/y/z')) 229 print(basename('/as/sd/df/fg/me.txt')) 230 print(dirname('/as/sd/df/fg/me.txt')) 231 print(join('/d', 'g', '/tyty/fgfg')) 232 232 windows = True 233 print host('/a/b/c/d-e-f')234 print host('//a/b//c/d-e-f')235 print shell('/w/x/y/z')236 print shell('w:/x/y/z')237 print basename('x:/sd/df/fg/me.txt')238 print dirname('x:/sd/df/fg/me.txt')239 print join('s:/d/', '/g', '/tyty/fgfg')233 print(host('/a/b/c/d-e-f')) 234 print(host('//a/b//c/d-e-f')) 235 print(shell('/w/x/y/z')) 236 print(shell('w:/x/y/z')) 237 print(basename('x:/sd/df/fg/me.txt')) 238 print(dirname('x:/sd/df/fg/me.txt')) 239 print(join('s:/d/', '/g', '/tyty/fgfg')) -
rtemstoolkit/version.py
rab922fe r04a5204 43 43 44 44 if __name__ == '__main__': 45 print 'major = %d' % (major)46 print 'minor = %d' % (minor)47 print 'revision = %d' % (revision)48 print 'Version: %s' % (str())45 print('major = %d' % (major)) 46 print('minor = %d' % (minor)) 47 print('revision = %d' % (revision)) 48 print('Version: %s' % (str()))
Note: See TracChangeset
for help on using the changeset viewer.