From 371e293d9deb3850c2e040fdbbbedf3ff9ea4484 Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <Nicolas.Dandrimont@crans.org>
Date: Sat, 28 Mar 2009 15:50:22 +0100
Subject: [PATCH] [munin/wiki_pages] Compatibilisation avec la nouvelle version
 de moin

darcs-hash:20090328145022-ffbb2-61467b04e868c0f3727865547fa8b5c060aebc7c.gz
---
 munin/wiki_pages | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/munin/wiki_pages b/munin/wiki_pages
index 25ec44f7..8e27a9ae 100644
--- a/munin/wiki_pages
+++ b/munin/wiki_pages
@@ -1,13 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-fichier = '/var/lib/munin/tmp/wiki_pages'
 
+FICHIER_MUNIN = '/var/lib/munin/tmp/wiki_pages'
 
-import sys,os
+import shutil
+import sys
 import tempfile
-from MoinMoin.request import RequestCLI
-
-sys.path.insert(0, '/etc/moin')
 
 try :
     arg = sys.argv[1]
@@ -24,18 +22,13 @@ if arg == "config" :
         print 'total.draw AREA'
         print 'orphelines.label Pages orphelines'
         print 'orphelines.draw AREA'
-
 elif arg == "fichier" :
-    request = RequestCLI(u"wiki.crans.org/")
+    from MoinMoin.request.request_cli import Request
+    sys.path.insert(0, '/etc/moin')
+
+    request = Request(u"wiki.crans.org/")
     request.form = request.args = request.setup_args()
-    _ = request.getText
-    #if request.mode_getpagelinks: # prevent recursion
-        #return ''
-    # find root page.
-    #from MoinMoin.Page import Page
-    #rootpage = Page(request, u"FrontPage", is_rootpage=1)
-    # delete all linked pages from a dict of all pages
-    #print request.cfg.__dict__
+    
     pages = request.rootpage.getPageDict(user='')
     orphaned = {}
     orphaned.update(pages)
@@ -45,13 +38,13 @@ elif arg == "fichier" :
             if link in orphaned:
                 del orphaned[link]
 
-    fichier_temp = tempfile.mktemp()
-    file = open('%s' % fichier_temp,'w')
+    tmpfile = tempfile.NamedTemporaryFile()
+    tmpfile.write("total.value %d\n" % pages.__len__())
+    tmpfile.write("orphelines.value %d\n" % orphaned.__len__())
+    tmpfile.flush()
 
-    file.write("total.value %d\n" % pages.__len__())
-    file.write("orphelines.value %d\n" % orphaned.__len__())
-    file.close()
-
-    os.system('mv %s %s' % (fichier_temp, fichier))
-else :
-    os.system('cat %s' % fichier)
+    shutil.copy(tmpfile.name, FICHIER_MUNIN)
+    
+    tmpfile.close()
+else:
+    sys.stdout.write(open(FICHIER_MUNIN).read())