improvement; follow-up to r11390 in order to use proper output/logging functions

Author: DrTrigon

blockpageschecker.py

@@ -354,7 +354,7 @@ def main():
 
         if changes == 0:
             # We tried to fix edit-protection templates, but it did not work.
-            pywikibot.output('Warning : No edit-protection template could be found')
+            pywikibot.warning('No edit-protection template could be found')
 
         if moveBlockCheck and changes > -1:
             # checking move protection now
@@ -402,7 +402,7 @@ def main():
 
             if changes == 0:
                 # We tried to fix move-protection templates, but it did not work.
-                pywikibot.output('Warning : No move-protection template could be found')
+                pywikibot.warning('No move-protection template could be found')
 
 
         if oldtext != text:

blockreview.py

@@ -82,7 +82,7 @@ def run(self):
                                      self.unblock_tpl[self.site.lang],
                                      defaultNamespace=10)
         except KeyError:
-            pywikibot.output(u'ERROR: Language "%s" not supported by this bot.'
+            pywikibot.error(u'Language "%s" not supported by this bot.'
                              % self.site.lang)
         else:
             for page in genPage.getReferences(follow_redirects=False,

category.py

@@ -302,9 +302,9 @@ def load(self, page):
                                  % page.title(asLink=True))
         except pywikibot.IsRedirectPage, arg:
             redirTarget = pywikibot.Page(self.site, arg.args[0])
-            pywikibot.output(u"WARNING: Page %s is a redirect to %s; skipping."
-                             % (page.title(asLink=True),
-                                redirTarget.title(asLink=True)))
+            pywikibot.warning(u"Page %s is a redirect to %s; skipping."
+                              % (page.title(asLink=True),
+                                 redirTarget.title(asLink=True)))
         else:
             return text
         return None

catimages.py

@@ -34,8 +34,6 @@
 
 X-untagged[:#]       Use daniel's tool as generator:
 X                    http://toolserver.org/~daniel/WikiSense/UntaggedImages.php
-
-
 """
 
 #
@@ -214,10 +212,10 @@ def _detect_Faces_CV(self):
             # how small and how many features are detected as faces (or eyes)
             scale  = max([1., np.average(np.array(img.shape)[0:2]/500.)])
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_Faces_CV]')
+            pywikibot.warning(u'unknown file type [_detect_Faces_CV]')
             return
         except AttributeError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_Faces_CV]')
+            pywikibot.warning(u'unknown file type [_detect_Faces_CV]')
             return
 
         #detectAndDraw( image, cascade, nestedCascade, scale );
@@ -419,10 +417,10 @@ def _detect_People_CV(self):
             scale  = max([1., np.average(np.array(img.shape)[0:2]/400.)])
             #scale  = max([1., np.average(np.array(img.shape)[0:2]/300.)])
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_People_CV]')
+            pywikibot.warning(u'unknown file type [_detect_People_CV]')
             return
         except AttributeError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_People_CV]')
+            pywikibot.warning(u'unknown file type [_detect_People_CV]')
             return
 
         # similar to face detection
@@ -529,10 +527,10 @@ def _util_get_Geometry_CVnSCIPY(self):
             # how small and how many features are detected
             scale  = max([1., np.average(np.array(img.shape)[0:2]/500.)])
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_Geometry_CV]')
+            pywikibot.warning(u'unknown file type [_detect_Geometry_CV]')
             return self._buffer_Geometry
         except AttributeError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_Geometry_CV]')
+            pywikibot.warning(u'unknown file type [_detect_Geometry_CV]')
             return self._buffer_Geometry
 
         # similar to face or people detection
@@ -750,7 +748,7 @@ def _detect_SegmentColors_JSEGnPIL(self):    # may be SLIC other other too...
             (l, t) = (0, 0)
             i = im
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_SegmentColors_JSEGnPIL]')
+            pywikibot.warning(u'unknown file type [_detect_SegmentColors_JSEGnPIL]')
             return
 
         result = []
@@ -764,7 +762,7 @@ def _detect_SegmentColors_JSEGnPIL(self):    # may be SLIC other other too...
             ##(pic, scale) = self._util_detect_ColorSegments_JSEG(pic)    # (final split)
             #hist = self._util_get_ColorSegmentsHist_PIL(i, pic, scale)  #
         except TypeError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_SegmentColors_JSEGnPIL]')
+            pywikibot.warning(u'unknown file type [_detect_SegmentColors_JSEGnPIL]')
             return
         i = 0
         # (may be do an additional region merge according to same color names...)
@@ -805,7 +803,7 @@ def _detect_AverageColor_PILnCV(self):
             i = Image.open(self.image_path_JPEG)
             h = i.histogram()
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_AverageColor_PILnCV]')
+            pywikibot.warning(u'unknown file type [_detect_AverageColor_PILnCV]')
             return
 
         result              = self._util_average_Color_colormath(h)
@@ -863,7 +861,7 @@ def _detect_Properties_PIL(self):
             try:
                 i = Image.open(self.image_path)
             except IOError:
-                pywikibot.output(u'WARNING: unknown (image) file type [_detect_Properties_PIL]')
+                pywikibot.warning(u'unknown (image) file type [_detect_Properties_PIL]')
                 return
 
             # http://mail.python.org/pipermail/image-sig/1999-May/000740.html
@@ -906,7 +904,7 @@ def _detect_Properties_PIL(self):
         #    result = {}
         #    # DO NOT use ImageMagick (identify) instead of PIL to get these info !!
         else:
-            pywikibot.output(u'WARNING: unknown (generic) file type [_detect_Properties_PIL]')
+            pywikibot.warning(u'unknown (generic) file type [_detect_Properties_PIL]')
             return
 
         result['Dimensions'] = self.image_size
@@ -1001,7 +999,7 @@ def _util_detect_ColorSegments_JSEG(self, im):
         try:
             smallImg = im.resize( tuple(np.int_(np.array(im.size)/scale)), Image.ANTIALIAS )
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_util_detect_ColorSegments_JSEG]')
+            pywikibot.warning(u'unknown file type [_util_detect_ColorSegments_JSEG]')
             return
 
         #im.thumbnail(size, Image.ANTIALIAS) # size is 640x480
@@ -1070,7 +1068,7 @@ def _util_get_ColorSegmentsHist_PIL(self, im, pic, scale):
         try:
             smallImg = im.resize( tuple(np.int_(np.array(im.size)/scale)), Image.ANTIALIAS )
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_util_get_ColorSegmentsHist_PIL]')
+            pywikibot.warning(u'unknown file type [_util_get_ColorSegmentsHist_PIL]')
             return
 
         imgsize = float(smallImg.size[0]*smallImg.size[1])
@@ -1190,10 +1188,10 @@ def _detect_Trained_CV(self, info_desc, cascade_file, maxdim=500.):
             # how small and how many features are detected
             scale  = max([1., np.average(np.array(img.shape)[0:2]/maxdim)])
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_Trained_CV]')
+            pywikibot.warning(u'unknown file type [_detect_Trained_CV]')
             return
         except AttributeError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_Trained_CV]')
+            pywikibot.warning(u'unknown file type [_detect_Trained_CV]')
             return
 
         # similar to face detection
@@ -1358,10 +1356,10 @@ def _detect_EmbeddedText_poppler(self):
         #    pdfinterp.process_pdf(rsrcmgr, device, fp, set(), maxpages=0, password='',
         #                caching=True, check_extractable=False)
         #except AssertionError:
-        #    pywikibot.output(u'WARNING: pdfminer missed, may be corrupt [_detect_EmbeddedText_poppler]')
+        #    pywikibot.warning(u'pdfminer missed, may be corrupt [_detect_EmbeddedText_poppler]')
         #    return
         #except TypeError:
-        #    pywikibot.output(u'WARNING: pdfminer missed, may be corrupt [_detect_EmbeddedText_poppler]')
+        #    pywikibot.warning(u'pdfminer missed, may be corrupt [_detect_EmbeddedText_poppler]')
         #    return
         #fp.close()
         #device.close()
@@ -1417,7 +1415,7 @@ def _recognize_OpticalCodes_dmtxNzbar(self):
 
             scale  = max([1., np.average(np.array(img.size)/200.)])
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_recognize_OpticalCodes_dmtxNzbar]')
+            pywikibot.warning(u'unknown file type [_recognize_OpticalCodes_dmtxNzbar]')
             return
 
         smallImg = img.resize( (int(img.size[0]/scale), int(img.size[1]/scale)) )
@@ -1454,7 +1452,7 @@ def _recognize_OpticalCodes_dmtxNzbar(self):
             img = Image.open(self.image_path_JPEG).convert('L')
             width, height = img.size
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_recognize_OpticalCodes_dmtxNzbar]')
+            pywikibot.warning(u'unknown file type [_recognize_OpticalCodes_dmtxNzbar]')
             return
 
         scanner = zbar.ImageScanner()
@@ -1504,10 +1502,10 @@ def _detect_Chessboard_CV(self):
 
             scale  = max([1., np.average(np.array(im.shape)[0:2]/1000.)])
         except IOError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_Chessboard_CV]')
+            pywikibot.warning(u'unknown file type [_detect_Chessboard_CV]')
             return
         except AttributeError:
-            pywikibot.output(u'WARNING: unknown file type [_detect_Chessboard_CV]')
+            pywikibot.warning(u'unknown file type [_detect_Chessboard_CV]')
             return
 
         smallImg = np.empty( (cv.Round(im.shape[1]/scale), cv.Round(im.shape[0]/scale)), dtype=np.uint8 )
@@ -1522,7 +1520,7 @@ def _detect_Chessboard_CV(self):
             #found_all, corners = cv.FindChessboardCorners( im, chessboard_dim )
             found_all, corners = cv2.findChessboardCorners( im, chessboard_dim )
         except cv2.error, e:
-            pywikibot.output(u'%s' % e)
+            pywikibot.error(u'%s' % e)
 
         #cv2.drawChessboardCorners( im, chessboard_dim, corners, found_all )
         ##cv2.imshow("win", im)
@@ -1806,7 +1804,7 @@ def _detect_Faces_EXIF(self):
             try:
                 (width, height) = (int(float(width)+0.5), int(float(height)+0.5))
             except ValueError:
-                pywikibot.output(u'WARNING: %s contains incompatible unit(s), skipped' % ((width, height),))
+                pywikibot.warning(u'%s contains incompatible unit(s), skipped' % ((width, height),))
                 return
         else:
             (width, height) = self.image_size
@@ -1921,8 +1919,8 @@ def _detect_Faces_EXIF(self):
             available = [item in res for item in ['FacesDetected', 'ValidAFPoints']]
             unknown   = ['face' in item.lower() for item in res.keys()]
             if make and (True in (available+unknown)):
-                pywikibot.output(u"WARNING: skipped '%s' since not supported (yet) [_detect_Faces_EXIF]" % make)
-                pywikibot.output(u"WARNING: FacesDetected: %s - ValidAFPoints: %s" % tuple(available))
+                pywikibot.warning(u"skipped '%s' since not supported (yet) [_detect_Faces_EXIF]" % make)
+                pywikibot.warning(u"FacesDetected: %s - ValidAFPoints: %s" % tuple(available))
 
         # finally, rotate face coordinates if image was rotated
         if wasRotated:
@@ -2209,7 +2207,7 @@ def _detect_AudioFeatures_YAAFE(self):
 
         # Load important components
         if (yaafe.loadComponentLibrary('yaafe-io')!=0):
-            pywikibot.output(u'WARNING: cannot load yaafe-io component library !')   # ! needed, else it will crash !
+            pywikibot.warning(u'cannot load yaafe-io component library !')   # ! needed, else it will crash !
 
         # Build a DataFlow object using FeaturePlan
         fp = yaafe.FeaturePlan(sample_rate=44100, normalize=0.98, resample=False)
@@ -2764,7 +2762,7 @@ def downloadImage(self):
         #self.image_size = (None, None)
         mime = mimetypes.guess_all_extensions('%s/%s' % tuple(self.image_mime[0:2]))
         if self.image_fileext.lower() not in mime:
-            pywikibot.output(u'WARNING: File extension does not match MIME type! File extension should be %s.' % mime)
+            pywikibot.warning(u'File extension does not match MIME type! File extension should be %s.' % mime)
 
         # SVG: rasterize the SVG to bitmap (MAY BE GET FROM WIKI BY DOWNLOAD?...)
         # (Mediawiki uses librsvg too: http://commons.wikimedia.org/wiki/SVG#SVGs_in_MediaWiki)
@@ -3481,12 +3479,12 @@ def main():
             Bot.downloadImage()
         except IOError, err:
             # skip if download not possible
-            pywikibot.output(u"WARNING: %s, skipped..." % err)
+            pywikibot.warning(u"%s, skipped..." % err)
             continue
         except Exception, err:
             # skip on any unexpected error, but report it
-            pywikibot.output(u"ERROR: %s" % err)
-            pywikibot.output(u"ERROR: was not able to process page %s !!!\n" %\
+            pywikibot.error(u"%s" % err)
+            pywikibot.error(u"was not able to process page %s !!!\n" %\
                              image.title(asLink=True))
             continue
         resultCheck = Bot.checkStep()
@@ -3496,8 +3494,8 @@ def main():
             if ret:
                 outresult.append( ret )
         except AttributeError:
-            pywikibot.output(u"ERROR: was not able to process page %s !!!\n" %\
-                             image.title(asLink=True))
+            pywikibot.error(u"was not able to process page %s !!!\n" %\
+                            image.title(asLink=True))
         limit += -1
         if not tagged:
             posfile = open(os.path.join(scriptdir, 'cache/catimages_start'), "w")
@@ -3548,13 +3546,13 @@ def trainbot(generator, Bot, image_old_namespace, image_namespace):
                 Bot.downloadImage()
             except IOError, err:
                 # skip if download not possible
-                pywikibot.output(u"WARNING: %s, skipped..." % err)
+                pywikibot.warning(u"%s, skipped..." % err)
                 continue
             except Exception, err:
                 # skip on any unexpected error, but report it
-                pywikibot.output(u"ERROR: %s" % err)
-                pywikibot.output(u"ERROR: was not able to process page %s !!!\n" %\
-                                 image.title(asLink=True))
+                pywikibot.error(u"%s" % err)
+                pywikibot.error(u"was not able to process page %s !!!\n" %\
+                                image.title(asLink=True))
                 continue
 
             # gather all features (information) related to current image

catlib.py

@@ -655,8 +655,8 @@ def change_category(article, oldCat, newCat, comment=None, sortKey=None,
             newCatList.append(cat)
 
     if not changesMade:
-        wikipedia.output(u'ERROR: %s is not in category %s!'
-                         % (article.title(asLink=True), oldCat.title()))
+        wikipedia.error(u'%s is not in category %s!'
+                        % (article.title(asLink=True), oldCat.title()))
     else:
         text = article.get(get_redirect=True)
         try:

censure.py

@@ -33,13 +33,13 @@
 
 site = pywikibot.getSite()
 if not (site.language() + '.' + site.family.name) in badWordList or not (site.language() + '.' + site.family.name) in logPages:
-    pywikibot.output('Error: your language isn\'t supported, see the source code for further details')
+    pywikibot.error('your language isn\'t supported, see the source code for further details')
     sys.exit(1)
 ownWordPage = pywikibot.Page(site, badWordList[site.language() + '.' + site.family.name])
 try:
     ownWordList = ownWordPage.get(get_redirect = True)
 except pywikibot.NoPage:
-    pywikibot.output('Error: the page containing the bad word list of your language doesn\'t exist')
+    pywikibot.error('the page containing the bad word list of your language doesn\'t exist')
     sys.exit(1)
 ownWordList = ownWordList.split('\n')
 del ownWordList[0]
@@ -109,7 +109,7 @@ def checkPage(title, onlyLastDiff = False):
         pywikibot.output(u'%s doesn\'t match any of the bad word list' %title)
 
 def main():
-    pywikibot.output('Warning: this script should not be run manually/directly, but automatically by maintainer.py')
+    pywikibot.warning('this script should not be run manually/directly, but automatically by maintainer.py')
     if len(sys.argv) == 1:
         pywikibot.output("Usage: censure.py <article title>")
         sys.exit(1)

checkimages.py

@@ -1600,7 +1600,7 @@ def findAdditionalProblems(self):
             elif imagechanges.lower() == 'true':
                 imagestatus = True
             else:
-                pywikibot.output(u"Error! Imagechanges set wrongly!")
+                pywikibot.error(u"Imagechanges set wrongly!")
                 self.settingsData = None
                 break
             summary = tupla[5]

featured.py

@@ -322,8 +322,8 @@ def featuredArticles(site, pType):
     try:
         method = info[site.lang][0]
     except KeyError:
-        pywikibot.output(
-            u'Error: language %s doesn\'t has %s category source.'
+        pywikibot.error(
+            u'language %s doesn\'t has %s category source.'
             % (site.lang, pType))
         return
     name = info[site.lang][1]

fixing_redirects.py

@@ -187,7 +187,7 @@ def workon(page):
         try:
             page.put(text, comment)
         except (pywikibot.Error):
-            pywikibot.output('Error: unable to put %s' % page)
+            pywikibot.error('unable to put %s' % page)
 
 def main():
     featured = False