Index: pykota/trunk/bin/edpykota
===================================================================
--- pykota/trunk/bin/edpykota (revision 3275)
+++ pykota/trunk/bin/edpykota (revision 3288)
@@ -24,5 +24,6 @@
 import sys
 
-from pykota.tool import Percent, PyKotaTool, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaCommandLineError
+from pykota.tool import Percent, PyKotaTool, crashed, N_
 from pykota.storage import StorageUserPQuota, StorageGroupPQuota
 
Index: pykota/trunk/bin/pkinvoice
===================================================================
--- pykota/trunk/bin/pkinvoice (revision 3276)
+++ pykota/trunk/bin/pkinvoice (revision 3288)
@@ -33,16 +33,17 @@
     from reportlab.lib.units import cm
 except ImportError :    
-    hasRL = 0
+    hasRL = False
 else :    
-    hasRL = 1
+    hasRL = True
     
 try :
     import PIL.Image 
 except ImportError :    
-    hasPIL = 0
+    hasPIL = False
 else :    
-    hasPIL = 1
-
-from pykota.tool import Percent, PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+    hasPIL = True
+
+from pykota.errors import PyKotaToolError, PyKotaCommandLineError
+from pykota.tool import Percent, PyKotaTool, crashed, N_
 
 __doc__ = N_("""pkinvoice v%(__version__)s (c) %(__years__)s %(__author__)s
Index: pykota/trunk/bin/pykotme
===================================================================
--- pykota/trunk/bin/pykotme (revision 3275)
+++ pykota/trunk/bin/pykotme (revision 3288)
@@ -26,5 +26,6 @@
 import pwd
 
-from pykota.tool import PyKotaTool, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaCommandLineError
+from pykota.tool import PyKotaTool, crashed, N_
 from pykota.accounter import openAccounter
     
Index: pykota/trunk/bin/pkbcodes
===================================================================
--- pykota/trunk/bin/pkbcodes (revision 3275)
+++ pykota/trunk/bin/pkbcodes (revision 3288)
@@ -26,5 +26,6 @@
 import pwd
 
-from pykota.tool import Percent, PyKotaTool, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaCommandLineError
+from pykota.tool import Percent, PyKotaTool, crashed, N_
 from pykota.storage import StorageBillingCode
 
Index: pykota/trunk/bin/pkturnkey
===================================================================
--- pykota/trunk/bin/pkturnkey (revision 3275)
+++ pykota/trunk/bin/pkturnkey (revision 3288)
@@ -29,5 +29,6 @@
 import signal
 
-from pykota.tool import Tool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaToolError, PyKotaCommandLineError
+from pykota.tool import Tool, crashed, N_
 
 __doc__ = N_("""pkturnkey v%(__version__)s (c) %(__years__)s %(__author__)s
Index: pykota/trunk/bin/pkusers
===================================================================
--- pykota/trunk/bin/pkusers (revision 3275)
+++ pykota/trunk/bin/pkusers (revision 3288)
@@ -26,5 +26,6 @@
 import grp
 
-from pykota.tool import Percent, PyKotaTool, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaCommandLineError
+from pykota.tool import Percent, PyKotaTool, crashed, N_
 from pykota.storage import StorageUser, StorageGroup
 
Index: pykota/trunk/bin/repykota
===================================================================
--- pykota/trunk/bin/repykota (revision 3275)
+++ pykota/trunk/bin/repykota (revision 3288)
@@ -28,5 +28,6 @@
 from mx import DateTime
 
-from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaToolError, PyKotaCommandLineError
+from pykota.tool import PyKotaTool, crashed, N_
 from pykota import reporter
 
Index: pykota/trunk/bin/warnpykota
===================================================================
--- pykota/trunk/bin/warnpykota (revision 3275)
+++ pykota/trunk/bin/warnpykota (revision 3288)
@@ -26,5 +26,6 @@
 import pwd
 
-from pykota.tool import PyKotaTool, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaCommandLineError
+from pykota.tool import PyKotaTool, crashed, N_
 
 __doc__ = N_("""warnpykota v%(__version__)s (c) %(__years__)s %(__author__)s
Index: pykota/trunk/bin/pkbanner
===================================================================
--- pykota/trunk/bin/pkbanner (revision 3275)
+++ pykota/trunk/bin/pkbanner (revision 3288)
@@ -33,16 +33,17 @@
     from reportlab.lib.units import cm
 except ImportError :    
-    hasRL = 0
+    hasRL = False
 else :    
-    hasRL = 1
+    hasRL = True
     
 try :
     import PIL.Image 
 except ImportError :    
-    hasPIL = 0
+    hasPIL = False
 else :    
-    hasPIL = 1
+    hasPIL = True
     
-from pykota.tool import Tool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaToolError, PyKotaCommandLineError
+from pykota.tool import Tool, crashed, N_
 
 __doc__ = N_("""pkbanner v%(__version__)s (c) %(__years__)s %(__author__)s
Index: pykota/trunk/bin/autopykota
===================================================================
--- pykota/trunk/bin/autopykota (revision 3275)
+++ pykota/trunk/bin/autopykota (revision 3288)
@@ -26,5 +26,6 @@
 import os
 
-from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaToolError, PyKotaCommandLineError
+from pykota.tool import PyKotaTool, crashed, N_
 
 __doc__ = N_("""autopykota v%(__version__)s (c) %(__years__)s %(__author__)s
Index: pykota/trunk/bin/pkprinters
===================================================================
--- pykota/trunk/bin/pkprinters (revision 3276)
+++ pykota/trunk/bin/pkprinters (revision 3288)
@@ -26,5 +26,6 @@
 import pwd
 
-from pykota.tool import Percent, PyKotaTool, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaCommandLineError
+from pykota.tool import Percent, PyKotaTool, crashed, N_
 from pykota.storage import StoragePrinter
 
Index: pykota/trunk/bin/cupspykota
===================================================================
--- pykota/trunk/bin/cupspykota (revision 3276)
+++ pykota/trunk/bin/cupspykota (revision 3288)
@@ -44,5 +44,6 @@
 from mx import DateTime
 
-from pykota.tool import PyKotaTool, PyKotaToolError, crashed
+from pykota.errors import PyKotaToolError
+from pykota.tool import PyKotaTool, crashed
 from pykota.accounter import openAccounter
 from pykota import cups
Index: pykota/trunk/bin/pknotify
===================================================================
--- pykota/trunk/bin/pknotify (revision 3276)
+++ pykota/trunk/bin/pknotify (revision 3288)
@@ -31,9 +31,10 @@
     import PAM
 except ImportError :    
-    hasPAM = 0
+    hasPAM = False
 else :    
-    hasPAM = 1
-
-from pykota.tool import Tool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+    hasPAM = True
+
+from pykota.errors import PyKotaToolError, PyKotaCommandLineError
+from pykota.tool import Tool, crashed, N_
 
 __doc__ = N_("""pknotify v%(__version__)s (c) %(__years__)s %(__author__)s
Index: pykota/trunk/bin/pykosd
===================================================================
--- pykota/trunk/bin/pykosd (revision 3275)
+++ pykota/trunk/bin/pykosd (revision 3288)
@@ -33,5 +33,6 @@
     sys.exit(-1)
 
-from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaToolError, PyKotaCommandLineError
+from pykota.tool import PyKotaTool, crashed, N_
 
 __doc__ = N_("""pykosd v%(__version__)s (c) %(__years__)s %(__author__)s
Index: pykota/trunk/bin/pkmail
===================================================================
--- pykota/trunk/bin/pkmail (revision 3275)
+++ pykota/trunk/bin/pkmail (revision 3288)
@@ -31,5 +31,6 @@
 import email.Utils
 
-from pykota.tool import PyKotaTool, PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaCommandLineError
+from pykota.tool import PyKotaTool, crashed, N_
     
 __doc__ = N_("""pkmail v%(__version__)s (c) %(__years__)s %(__author__)s
Index: pykota/trunk/bin/dumpykota
===================================================================
--- pykota/trunk/bin/dumpykota (revision 3275)
+++ pykota/trunk/bin/dumpykota (revision 3288)
@@ -24,5 +24,6 @@
 import sys
 
-from pykota.tool import PyKotaCommandLineError, crashed, N_
+from pykota.errors import PyKotaCommandLineError
+from pykota.tool import crashed, N_
 from pykota.dumper import DumPyKota
 
Index: pykota/trunk/bin/pkrefund
===================================================================
--- pykota/trunk/bin/pkrefund (revision 3276)
+++ pykota/trunk/bin/pkrefund (revision 3288)
@@ -33,16 +33,17 @@
     from reportlab.lib.units import cm
 except ImportError :    
-    hasRL = 0
+    hasRL = False
 else :    
-    hasRL = 1
+    hasRL = True
     
 try :
     import PIL.Image 
 except ImportError :    
-    hasPIL = 0
+    hasPIL = False
 else :    
-    hasPIL = 1
-
-from pykota.tool import Percent, PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
+    hasPIL = True
+
+from pykota.errors import PyKotaToolError, PyKotaCommandLineError
+from pykota.tool import Percent, PyKotaTool, crashed, N_
 
 __doc__ = N_("""pkrefund v%(__version__)s (c) %(__years__)s %(__author__)s
