[Moin-devel] CVS: MoinMoin Page.py,1.111,1.112 config.py,1.63,1.64 editlog.py,1.15,1.16 httpdmain.py,1.10,1.11 util.py,1.37,1.38

[J?rgen Hermann]

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

Modified Files:
	Page.py config.py editlog.py httpdmain.py util.py 
Log Message:
Refactoring: Fixes for pychecker warnings


Index: Page.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/Page.py,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -r1.111 -r1.112
*** Page.py	27 Mar 2002 21:46:50 -0000	1.111
--- Page.py	27 Mar 2002 22:41:14 -0000	1.112
***************
*** 9,13 ****
  
  # Imports
! import cStringIO, os, re, sys, string, time, urllib
  from MoinMoin import caching, config, eventlog, user, util, wikiutil, webapi
  from MoinMoin.cgimain import request
--- 9,13 ----
  
  # Imports
! import cStringIO, os, re, sys, string, urllib
  from MoinMoin import caching, config, eventlog, user, util, wikiutil, webapi
  from MoinMoin.cgimain import request

Index: config.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/config.py,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** config.py	27 Mar 2002 21:57:46 -0000	1.63
--- config.py	27 Mar 2002 22:41:14 -0000	1.64
***************
*** 172,177 ****
  
  if default_config:
-     import new
      from MoinMoin import cgimain
!     cgimain.request = new.classobj('Request', (), {}) 
  
--- 172,176 ----
  
  if default_config:
      from MoinMoin import cgimain
!     cgimain.request = None
  

Index: editlog.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/editlog.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** editlog.py	12 Mar 2002 04:09:00 -0000	1.15
--- editlog.py	27 Mar 2002 22:41:14 -0000	1.16
***************
*** 12,16 ****
  
  # Imports
! import cgi, os, string, time
  from MoinMoin import config, user, wikiutil
  from MoinMoin.Page import Page
--- 12,16 ----
  
  # Imports
! import cgi, os, string
  from MoinMoin import config, user, wikiutil
  from MoinMoin.Page import Page
***************
*** 34,38 ****
          return None
  
!     def addEntry(self, pagename, host, mtime, comment):
          """ Add an entry to the editlog """
          pass
--- 34,38 ----
          return None
  
!     def addEntry(self, pagename, host, mtime, comment, action):
          """ Add an entry to the editlog """
          pass
***************
*** 61,64 ****
--- 61,65 ----
          if not os.access(self.filename, os.W_OK):
              return "The edit log '%s' is not writable!" % (self.filename,)
+         return None
  
      def addEntry(self, pagename, host, mtime, comment, action="SAVE"):
***************
*** 102,105 ****
--- 103,107 ----
      if schema == "text":
          return LogText(optstr)
+     return None
  
  

Index: httpdmain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/httpdmain.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** httpdmain.py	21 Mar 2002 00:18:24 -0000	1.10
--- httpdmain.py	27 Mar 2002 22:41:14 -0000	1.11
***************
*** 80,85 ****
  
          """
-         import urllib
- 
          file = urllib.unquote(uri)
          file.replace('\\', '/')
--- 80,83 ----

Index: util.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/util.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** util.py	25 Mar 2002 13:12:21 -0000	1.37
--- util.py	27 Mar 2002 22:41:14 -0000	1.38
***************
*** 11,15 ****
  
  # Imports
! import os, re, string, sys, time
  from MoinMoin.i18n import _
  
--- 11,15 ----
  
  # Imports
! import os, re, string, time
  from MoinMoin.i18n import _
  
***************
*** 61,65 ****
          Set a different "From" address with "mail_from=<email>".
      """
!     import os, smtplib, socket
      from MoinMoin import config
  
--- 61,65 ----
          Set a different "From" address with "mail_from=<email>".
      """
!     import smtplib, socket
      from MoinMoin import config