[Translate-cvs] src/translate/filters pofilter.py,1.5,1.6

[Dwayne B. <dwa...@us...>]

Update of /cvsroot/translate/src/translate/filters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12932

Modified Files:
	pofilter.py 
Log Message:
Now correctly ignore reviews with --noreview
Also ensured that the default is to include revies and fuzzies


Index: pofilter.py
===================================================================
RCS file: /cvsroot/translate/src/translate/filters/pofilter.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pofilter.py	14 Dec 2004 21:26:52 -0000	1.5
+++ pofilter.py	14 Dec 2004 21:32:15 -0000	1.6
@@ -73,13 +73,14 @@
     return not thepo.hastypecomment("review")
 
 class pocheckfilter:
-  def __init__(self, checkerclasses=None, excludefilters={}, limitfilters=None, includeheader=False, includefuzzy=False):
+  def __init__(self, checkerclasses=None, excludefilters={}, limitfilters=None, includeheader=False, includefuzzy=True, includereview=True):
     """builds a pocheckfilter using the given checker (a list is allowed too)"""
     if checkerclasses is None:
       checkerclasses = [checks.StandardChecker, StandardPOChecker]
     self.checker = POTeeChecker(excludefilters=excludefilters, limitfilters=limitfilters, checkerclasses=checkerclasses)
     self.includeheader = includeheader
     self.includefuzzy = includefuzzy
+    self.includereview = includereview
 
   def getfilterdocs(self):
     """lists the docs for filters available on checker..."""
@@ -92,6 +93,7 @@
     """runs filters on an element"""
     if thepo.isheader(): return []
     if not self.includefuzzy and thepo.isfuzzy(): return []
+    if not self.includereview and thepo.isreview(): return []
     if thepo.hasplural():
       unquotedid = po.getunquotedstr(thepo.msgid, joinwithlinebreak=False)
       unquotedstr = po.getunquotedstr(thepo.msgstr[0], joinwithlinebreak=False)
@@ -140,7 +142,7 @@
       checkerclasses = [checks.StandardChecker, StandardPOChecker]
     else:
       checkerclasses = [options.filterclass, StandardPOChecker]
-    options.checkfilter = pocheckfilter(checkerclasses, options.excludefilters, options.limitfilters, options.includeheader, options.includefuzzy)
+    options.checkfilter = pocheckfilter(checkerclasses, options.excludefilters, options.limitfilters, options.includeheader, options.includefuzzy, options.includereview)
     if not options.checkfilter.checker.combinedfilters:
       self.error("No valid filters were specified")
     options.inputformats = self.inputformats