X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=xsetbg.py;h=0d9d646e50fd94963c435bb6832395c7dab78184;hb=74669ff7c80440e8d0def1b9955239e9146f1308;hp=ce3ffad81a0c3db08c712e9802191703da30c108;hpb=8cc3d8fdd0f96d52350e228de472e849ba62ce6a;p=xsetbg.git

diff --git a/xsetbg.py b/xsetbg.py
index ce3ffad..0d9d646 100755
--- a/xsetbg.py
+++ b/xsetbg.py
@@ -3,7 +3,7 @@
 
 Select a random image from a (list of) directory(s)
 and set it as the desktop wallpaper (display it in the root window)
-using xli or xsetbg programs.
+using xli program.
 
 """
 
@@ -11,13 +11,25 @@ __version__ = "$Revision$"[11:-2]
 __revision__ = "$Id$"[5:-2]
 __date__ = "$Date$"[7:-2]
 
-__author__ = "Oleg Broytman <phd@phd.pp.ru>"
+__author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2000-2010 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 
 import sys, os
+from ConfigParser import SafeConfigParser
+
+import anydbm
+import random
+import shelve
 import subprocess
+from time import time
+from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB
+
+from wsgiref import simple_server
+from wsgiref.handlers import SimpleHandler
+from wsgiref.simple_server import WSGIServer, make_server
+simple_server.ServerHandler = SimpleHandler # Stop logging to stdout
 
 
 def error(error_str, error_code=1):
@@ -25,8 +37,6 @@ def error(error_str, error_code=1):
    sys.exit(error_code)
 
 
-from ConfigParser import SafeConfigParser
-
 xsetbg_dir = os.path.dirname(os.path.abspath(__file__))
 os.chdir(xsetbg_dir)
 
@@ -102,14 +112,7 @@ filename_key = "filename"
 old_filename_key = "old_filename"
 
 
-import random
-import anydbm, shelve
-from time import time
-from fcntl import flock, LOCK_EX, LOCK_UN, LOCK_NB
-
-# Import pickle and all anydbm/shelve internal machinery, so that
-# when ReadyExec forks they will be ready.
-# Also create the database if it is not exists yet.
+# Create the database if it is not exists yet.
 
 try:
    global_db = shelve.open(global_db_name, flag='c')
@@ -218,11 +221,6 @@ def stop():
     QuitWSGIServer._quit_flag = True
 
 
-from wsgiref.handlers import SimpleHandler
-from wsgiref import simple_server
-simple_server.ServerHandler = SimpleHandler # Stop logging to stdout
-from wsgiref.simple_server import WSGIServer, make_server
-
 g = globals().copy()
 commands = dict([(name, g[name]) for name in g
     if getattr(g[name], '_wsgi_published', False)])
@@ -256,5 +254,6 @@ def app(env, start_response):
     start_response(status, response_headers)
     return ['Ok\n']
 
+force()
 httpd = make_server(host, port, app, server_class=QuitWSGIServer)
 httpd.serve_forever()