Various improvements in coding style.

1 files changed, 13 insertions, 18 deletions

diff --git a/minidinstall/DpkgDatalist.py b/minidinstall/DpkgDatalist.py
index 68f9940..e7abbd2 100644
--- a/minidinstall/DpkgDatalist.py
+++ b/minidinstall/DpkgDatalist.py
@@ -1,10 +1,10 @@
-# DpkgDatalist.py
+# DpkgDatalist -*- mode: python; coding: utf-8 -*-
 #
 # This module implements DpkgDatalist, an abstract class for storing 
 # a list of objects in a file. Children of this class have to implement
 # the load and _store methods.
 #
-# Copyright 2001 Wichert Akkerman <wichert@linux.com>
+# Copyright (c) 2001 Wichert Akkerman <wichert@linux.com>
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -20,34 +20,31 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-import os, sys
-from collections import UserDict
-from collections import OrderedDict
-from minidinstall.SafeWriteFile import SafeWriteFile
+import sys
+from collections import UserDict, OrderedDict
+from .SafeWriteFile import SafeWriteFile
 
 class DpkgDatalistException(Exception):
     UNKNOWN     = 0
     SYNTAXERROR = 1
 
-    def __init__(self, message="", reason=UNKNOWN, file=None, line=None):
+    def __init__(self, message=None, reason=UNKNOWN, file=None, line=None):
         self.message=message
         self.reason=reason
         self.filename=file
         self.line=line
 
 class _DpkgDatalist:
-    def __init__(self, fn=""):
-        '''Initialize a DpkgDatalist object. An optional argument is a
-        file from which we load values.'''
-
+    def __init__(self, fn=None):
+        """Initialize a DpkgDatalist object. An optional argument is a
+        file from which we load values."""
         self.filename=fn
         if self.filename:
             self.load(self.filename)
 
     def store(self, fn=None):
-        "Store variable data in a file."
-
-        if fn==None:
+        """Store variable data in a file."""
+        if not fn:
             fn=self.filename
         # Special case for writing to stdout
         if not fn:
@@ -64,15 +61,13 @@ class _DpkgDatalist:
             if isinstance(fn, str):
                 vf.close()
 
-
 class DpkgDatalist(UserDict, _DpkgDatalist):
-    def __init__(self, fn=""):
+    def __init__(self, fn=None):
         UserDict.__init__(self)
         _DpkgDatalist.__init__(self, fn)
 
-
 class DpkgOrderedDatalist(OrderedDict, _DpkgDatalist):
-    def __init__(self, fn=""):
+    def __init__(self, fn=None):
         OrderedDict.__init__(self)
         _DpkgDatalist.__init__(self, fn)