[Moin-devel] CVS: MoinMoin/macro FullSearch.py,1.6,1.7 RecentChanges.py,1.54,1.55 WantedPages.py,1.7,1.8

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin/macro
In directory usw-pr-cvs1:/tmp/cvs-serv13801/MoinMoin/macro

Modified Files:
	FullSearch.py RecentChanges.py WantedPages.py 
Log Message:
Refactoring: Fixes for pychecker warnings


Index: FullSearch.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/FullSearch.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** FullSearch.py	26 Mar 2002 18:56:44 -0000	1.6
--- FullSearch.py	27 Mar 2002 22:41:14 -0000	1.7
***************
*** 21,25 ****
  
  # Imports
! import cgi, re, urllib
  from MoinMoin import config, user, wikiutil
  from MoinMoin.i18n import _
--- 21,25 ----
  
  # Imports
! import re, urllib
  from MoinMoin import config, user, wikiutil
  from MoinMoin.i18n import _

Index: RecentChanges.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/RecentChanges.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** RecentChanges.py	20 Feb 2002 00:28:52 -0000	1.54
--- RecentChanges.py	27 Mar 2002 22:41:14 -0000	1.55
***************
*** 9,14 ****
  
  # Imports
! import cgi, re, string, sys, time
! from cStringIO import StringIO
  from MoinMoin import config, editlog, user, util, wikiutil, wikixml
  from MoinMoin.Page import Page
--- 9,13 ----
  
  # Imports
! import cgi, re, string, sys, time, cStringIO
  from MoinMoin import config, editlog, user, util, wikiutil, wikixml
  from MoinMoin.Page import Page
***************
*** 28,32 ****
      tnow = time.time()
      msg = ""
!     buf = StringIO()
  
      # add rss link
--- 27,31 ----
      tnow = time.time()
      msg = ""
!     buf = cStringIO.StringIO()
  
      # add rss link
***************
*** 137,141 ****
              if tdiff < 1440:
                  buf.write(_("[%(hours)dh %(mins)dm ago]") % {
!                     'hours': tdiff/60, 'mins': tdiff%60})
              else:
                  buf.write(time.strftime(config.changed_time_fmt, log.time_tuple))
--- 136,140 ----
              if tdiff < 1440:
                  buf.write(_("[%(hours)dh %(mins)dm ago]") % {
!                     'hours': int(tdiff/60), 'mins': tdiff%60})
              else:
                  buf.write(time.strftime(config.changed_time_fmt, log.time_tuple))
***************
*** 262,266 ****
          """
          from MoinMoin import webapi
!         import os, re, new, cStringIO
  
          # get params
--- 261,265 ----
          """
          from MoinMoin import webapi
!         import os, new
  
          # get params

Index: WantedPages.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/macro/WantedPages.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** WantedPages.py	20 Mar 2002 23:57:07 -0000	1.7
--- WantedPages.py	27 Mar 2002 22:41:14 -0000	1.8
***************
*** 9,13 ****
  
  # Imports
! import cgi, string, urllib
  from MoinMoin import config, user, wikiutil
  from MoinMoin.Page import Page
--- 9,13 ----
  
  # Imports
! import string, urllib
  from MoinMoin import config, user, wikiutil
  from MoinMoin.Page import Page