[BT++ CVS] BT++/src/WebServer BTWebServer.py,1.10,1.11 htmltmpl.py,1.1,1.2

[<bel...@us...>]

Update of /cvsroot/btplusplus/BT++/src/WebServer
In directory sc8-pr-cvs1:/tmp/cvs-serv24607/src/WebServer

Modified Files:
	BTWebServer.py htmltmpl.py 
Log Message:
Made build work for windows. Use WT++.pyw for windows since readline doesn't work there.
Fixed a bug(?) in htmltmpl on Windows.
Fixed menu.tmpl for Opera7

Index: BTWebServer.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/WebServer/BTWebServer.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BTWebServer.py	16 Mar 2003 01:45:18 -0000	1.10
--- BTWebServer.py	25 Mar 2003 00:27:02 -0000	1.11
***************
*** 41,70 ****
  except: pass
  
- try: remove("WebTemplates/root.tmplc")
- except: pass
  templateRoot = TemplateManager().prepare("WebTemplates/root.tmpl")
- 
- try: remove("WebTemplates/menu.tmplc")
- except: pass
  templateMenu = TemplateManager().prepare("WebTemplates/menu.tmpl")
- 
- try: remove("WebTemplates/exit.tmplc")
- except: pass
  templateExit = TemplateManager().prepare("WebTemplates/exit.tmpl")
- 
- try: remove("WebTemplates/dl_fail.tmplc")
- except: pass
  templateDLFail = TemplateManager().prepare("WebTemplates/dl_fail.tmpl")
- 
- try: remove("WebTemplates/torrent.tmplc")
- except: pass
  templateTorrent = TemplateManager().prepare("WebTemplates/torrent.tmpl")
- 
- try: remove("WebTemplates/log.tmplc")
- except: pass
  templateLog = TemplateManager().prepare("WebTemplates/log.tmpl")
- 
- try: remove("WebTemplates/config.tmplc")
- except: pass
  templateConfig = TemplateManager().prepare("WebTemplates/config.tmpl")
  
--- 41,50 ----

Index: htmltmpl.py
===================================================================
RCS file: /cvsroot/btplusplus/BT++/src/WebServer/htmltmpl.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** htmltmpl.py	27 Feb 2003 00:44:40 -0000	1.1
--- htmltmpl.py	25 Mar 2003 00:27:03 -0000	1.2
***************
*** 19,22 ****
--- 19,25 ----
  
      Copyright (c) 2001 Tomas Styblo, tr...@cp...
+     
+     Modified 3/2003 Tobias Minich, bel...@us...
+         Locking produced some errors on Windows
  
      @name           htmltmpl
***************
*** 282,286 ****
                  msvcrt.locking(fd, msvcrt.LK_LOCK, 1)
              elif lock == LOCK_UN:
!                 msvcrt.locking(fd, msvcrt.LK_UNLCK, 1)
              else:
                  raise TemplateError, "BUG: bad lock in lock_file"
--- 285,292 ----
                  msvcrt.locking(fd, msvcrt.LK_LOCK, 1)
              elif lock == LOCK_UN:
!                 ## Modified by Tobias Minich
!                 ## original didn't seem to work on Windows
!                 try: msvcrt.locking(fd, msvcrt.LK_UNLCK, 1)
!                 except: pass
              else:
                  raise TemplateError, "BUG: bad lock in lock_file"