ImportErrors are uncovered

builder/kojid

@@ -23,7 +23,7 @@
 
 try:
     import krbV
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 import koji
 import koji.plugin
@@ -69,7 +69,7 @@ try:
     import hashlib
     import iso9660 # from pycdio
     image_enabled = True
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 
 ozif_enabled = False
@@ -87,7 +87,7 @@ try:
     # NOTE: import below requires Factory 1.1.7 or higher
     from imgfac.FactoryUtils import qemu_convert_cmd
     ozif_enabled = True
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 
 def main(options, session):

cli/koji

@@ -27,15 +27,15 @@
 import sys
 try:
     import krbV
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 try:
     import ast
-except ImportError:
+except ImportError:  # pragma: no cover
     ast = None
 try:
     import json
-except ImportError:
+except ImportError:  # pragma: no cover
     try:
         import simplejson as json
     except ImportError:
@@ -63,7 +63,7 @@ import urlgrabber.progress as progress
 import xmlrpclib
 try:
     import libcomps
-except ImportError:
+except ImportError:  # pragma: no cover
     libcomps = None
     try:
         import yum.comps as yumcomps
@@ -75,7 +75,7 @@ import optparse
 # fix OptionParser for python 2.3 (optparse verion 1.4.1+)
 # code taken from optparse version 1.5a2
 OptionParser = optparse.OptionParser
-if optparse.__version__ == "1.4.1+":
+if optparse.__version__ == "1.4.1+":  # pragma: no cover
     def _op_error(self, msg):
         self.print_usage(sys.stderr)
         msg = "%s: error: %s\n" % (self._get_prog_name(), msg)

hub/kojihub.py

@@ -59,7 +59,7 @@ from koji.context import context
 
 try:
     import json
-except ImportError:
+except ImportError:  # pragma: no cover
     import simplejson as json
 
 

koji/__init__.py

@@ -51,7 +51,7 @@ import socket
 import ssl.SSLCommon
 try:
     from ssl import ssl as pyssl
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 import struct
 import tempfile

koji/db.py

@@ -29,7 +29,7 @@ import traceback
 _quoteparams = None
 try:
     from pgdb import _quoteparams
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 assert pgdb.threadsafety >= 1
 import context

koji/server.py

@@ -25,7 +25,7 @@ from koji.util import LazyDict
 
 try:
     from mod_python import apache
-except ImportError:
+except ImportError:  # pragma: no cover
     apache = None
 
 

koji/ssl/__init__.py

@@ -3,6 +3,6 @@
 # our own ssl submodule masks python's in the main lib, so we import this here
 try:
     import ssl      # python's ssl module
-except ImportError:
+except ImportError:  # pragma: no cover
     # ssl module added in 2.6
     pass

koji/util.py

@@ -36,11 +36,11 @@ from zlib import adler32
 # imported from kojiweb and kojihub
 try:
     from hashlib import md5 as md5_constructor
-except ImportError:
+except ImportError:  # pragma: no cover
     from md5 import new as md5_constructor
 try:
     from hashlib import sha1 as sha1_constructor
-except ImportError:
+except ImportError:  # pragma: no cover
     from sha import new as sha1_constructor
 
 def _changelogDate(cldate):

plugins/builder/runroot.py

@@ -13,7 +13,7 @@ try:
     from koji.util import parseStatus as _parseStatus
     from koji.daemon import log_output
     from __main__ import BuildRoot
-except ImportError:
+except ImportError:  # pragma: no cover
     compat_mode = True
     #old way
     import tasks

util/koji-gc

@@ -8,7 +8,7 @@
 
 try:
     import krbV
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 import koji
 from koji.util import LazyDict, LazyValue

util/koji-shadow

@@ -23,7 +23,7 @@
 
 try:
     import krbV
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 import koji
 import ConfigParser

util/kojira

@@ -22,7 +22,7 @@
 
 try:
     import krbV
-except ImportError:
+except ImportError:  # pragma: no cover
     pass
 import sys
 import os

vm/kojivmd

@@ -46,7 +46,7 @@ from ConfigParser import ConfigParser
 from optparse import OptionParser
 try:
     import krbV
-except ImportError:
+except ImportError:  # pragma: no cover
     pass