mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00
Code

PEP8-ified parts of the code.

Browse Source 
Exchange individual return statements with a finally statement in the
big try/except statement in babysitter.py. If you return a different
value in the 'except' clause, it takes precedency over the 'finally'
clause (finally is executed before returning, naturally).
This commit is contained in:
Sascha Peilicke 2011-07-08 16:09:44 +02:00
parent 6676d530bc
commit 438569f821
4 changed files with 38 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osc-wrapper.py
View File

@ -3,7 +3,11 @@
# this wrapper exists so it can be put into /usr/bin, but still allows the
# python module to be called within the source directory during development
import sys, locale
import locale
import sys
from osc import commandline, babysitter
# this is a hack to make osc work as expected with utf-8 characters,
# no matter how site.py is set...
reload(sys)
@ -13,9 +17,6 @@ if not loc:
sys.setdefaultencoding(loc)
del sys.setdefaultencoding
from osc import commandline
from osc import babysitter
osccli = commandline.Osc()
r = babysitter.run(osccli)

93
osc/babysitter.py
View File

@ -3,13 +3,14 @@
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
import errno
import os.path
import pdb
import sys
import signal
import errno
import traceback
from osc import oscerr
from urllib2 import URLError, HTTPError
from httplib import HTTPException, BadStatusLine
from oscsslexcp import NoSecureSSLError
from osc.util.cpio import CpioError
from osc.util.packagequery import PackageError
@ -28,79 +29,65 @@ except:
# if rpm-python isn't installed (we might be on a debian system):
RPMError = None
from httplib import HTTPException, BadStatusLine
from urllib2 import URLError, HTTPError
# the good things are stolen from Matt Mackall's mercurial
def catchterm(*args):
raise oscerr.SignalInterrupt
for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
num = getattr(signal, name, None)
if num: signal.signal(num, catchterm)
if num:
signal.signal(num, catchterm)
def run(prg):
try:
try:
if '--debugger' in sys.argv:
import pdb
pdb.set_trace()
# here we actually run the program:
return prg.main()
except:
# look for an option in the prg.options object and in the config dict
# print stack trace, if desired
# look for an option in the prg.options object and in the config
# dict print stack trace, if desired
if getattr(prg.options, 'traceback', None) or getattr(prg.conf, 'config', {}).get('traceback', None) or \
getattr(prg.options, 'post_mortem', None) or getattr(prg.conf, 'config', {}).get('post_mortem', None):
import traceback
traceback.print_exc(file=sys.stderr)
# we could use http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52215
# enter the debugger, if desired
if getattr(prg.options, 'post_mortem', None) or getattr(prg.conf, 'config', {}).get('post_mortem', None):
if sys.stdout.isatty() and not hasattr(sys, 'ps1'):
import pdb
pdb.post_mortem(sys.exc_info()[2])
else:
print >>sys.stderr, 'sys.stdout is not a tty. Not jumping into pdb.'
raise
except oscerr.SignalInterrupt:
print >>sys.stderr, 'killed!'
return 1
except KeyboardInterrupt:
print >>sys.stderr, 'interrupted!'
return 1
except oscerr.UserAbort:
print >>sys.stderr, 'aborted.'
return 1
except oscerr.APIError, e:
print >>sys.stderr, 'BuildService API error:', e.msg
return 1
except oscerr.LinkExpandError, e:
print >>sys.stderr, 'Link "%s/%s" cannot be expanded:\n' % (e.prj, e.pac), e.msg
print >>sys.stderr, 'Use "osc repairlink" to fix merge conflicts.\n'
return 1
except oscerr.WorkingCopyWrongVersion, e:
print >>sys.stderr, e
except oscerr.NoWorkingCopy, e:
print >>sys.stderr, e
if os.path.isdir('.git'): print >>sys.stderr, "Current directory looks like git."
if os.path.isdir('.hg'): print >>sys.stderr, "Current directory looks like mercurial."
if os.path.isdir('.svn'): print >>sys.stderr, "Current directory looks like svn."
if os.path.isdir('CVS'): print >>sys.stderr, "Current directory looks like cvs."
return 1
if os.path.isdir('.git'):
print >>sys.stderr, "Current directory looks like git."
if os.path.isdir('.hg'):
print >>sys.stderr, "Current directory looks like mercurial."
if os.path.isdir('.svn'):
print >>sys.stderr, "Current directory looks like svn."
if os.path.isdir('CVS'):
print >>sys.stderr, "Current directory looks like cvs."
except HTTPError, e:
print >>sys.stderr, 'Server returned an error:', e
if hasattr(e, 'osc_msg'):
@ -121,100 +108,60 @@ def run(prg):
msg = body.split('<summary>')[1]
msg = msg.split('</summary>')[0]
print >>sys.stderr, msg
return 1
except BadStatusLine, e:
print >>sys.stderr, 'Server returned an invalid response:', e
print >>sys.stderr, e.line
return 1
except HTTPException, e:
print >>sys.stderr, e
return 1
except URLError, e:
print >>sys.stderr, 'Failed to reach a server:\n', e.reason
return 1
except IOError, e:
# ignore broken pipe
if e.errno != errno.EPIPE:
raise
return 1
except OSError, e:
if e.errno != errno.ENOENT:
raise
print >>sys.stderr, e
return 1
except (oscerr.ConfigError, oscerr.NoConfigfile), e:
print >>sys.stderr, e.msg
return 1
except oscerr.OscIOError, e:
print >>sys.stderr, e.msg
if getattr(prg.options, 'debug', None) or \
getattr(prg.conf, 'config', {}).get('debug', None):
print >>sys.stderr, e.e
return 1
except (oscerr.WrongOptions, oscerr.WrongArgs), e:
print >>sys.stderr, e
return 2
except oscerr.ExtRuntimeError, e:
print >>sys.stderr, e.msg
return 1
except oscerr.WorkingCopyOutdated, e:
print >>sys.stderr, e
return 1
except (oscerr.PackageExists, oscerr.PackageMissing, oscerr.WorkingCopyInconsistent), e:
print >>sys.stderr, e.msg
return 1
except oscerr.PackageInternalError, e:
import traceback
print >>sys.stderr, 'a package internal error occured\n' \
'please file a bug and attach your current package working copy ' \
'and the following traceback to it:'
print >>sys.stderr, e.msg
traceback.print_exc(file=sys.stderr)
return 1
except oscerr.PackageError, e:
print >>sys.stderr, e.msg
return 1
except PackageError, e:
print >>sys.stderr, '%s:' % e.fname, e.msg
return 1
except RPMError, e:
print >>sys.stderr, e
return 1
except SSLError, e:
print >>sys.stderr, "SSL Error:", e
return 1
except SSLVerificationError, e:
print >>sys.stderr, "Certificate Verification Error:", e
return 1
except NoSecureSSLError, e:
print >>sys.stderr, e
return 1
except CpioError, e:
print >>sys.stderr, e
return 1
except oscerr.OscBaseError, e:
print >>sys.stderr, '*** Error:', e
finally:
return 1
# vim: sw=4 et

8
osc/commandline.py
View File

@ -4,14 +4,17 @@
# either version 2, or version 3 (at your option).
from core import *
import cmdln
import conf
import oscerr
import sys
from util import safewriter
import time
from optparse import SUPPRESS_HELP
from core import *
from util import safewriter
MAN_HEADER = r""".TH %(ucname)s "1" "%(date)s" "%(name)s %(version)s" "User Commands"
.SH NAME
%(name)s \- openSUSE build service command-line tool.
@ -1964,7 +1967,6 @@ Please submit there instead, or use --nodevelproject to force direct submission.
return
results.sort(reverse=True)
import time
days = opts.days or conf.config['request_list_days']
since = ''
try:

5
setup.py
View File

@ -15,6 +15,7 @@ try:
except:
HAVE_PY2EXE = False
class build_osc(distutils.command.build.build, object):
"""
Custom build command which generates man page.
@ -28,8 +29,8 @@ class build_osc(distutils.command.build.build, object):
distutils.log.info('generating %s' % man_path)
outfile = gzip.open(man_path, 'w')
osccli = commandline.Osc(stdout=outfile)
# FIXME: we cannot call the main method because osc expects an ~/.oscrc file
# (this would break builds in environments like the obs)
# FIXME: we cannot call the main method because osc expects an ~/.oscrc
# file (this would break builds in environments like the obs)
#osccli.main(argv = ['osc','man'])
osccli.optparser = osccli.get_optparser()
osccli.do_man(None)