1.1 --- a/simplify/__init__.py Thu Jul 26 20:26:47 2007 +0200
1.2 +++ b/simplify/__init__.py Fri Jul 27 20:54:33 2007 +0200
1.3 @@ -26,6 +26,9 @@
1.4 importer = Importer(sys.path)
1.5 importer.load_from_file(builtins)
1.6 importer.load_from_file(filename, builtins)
1.7 +
1.8 +Such importer objects are the most convenient mechanism through which the
1.9 +functionality of the simplify package may be accessed.
1.10 """
1.11
1.12 from simplify.simplified import *
1.13 @@ -38,14 +41,13 @@
1.14
1.15 "An import machine, searching for and loading modules."
1.16
1.17 - def __init__(self, path=None, annotate=1, fixinstances=1):
1.18 + def __init__(self, path=None, annotate=1):
1.19
1.20 """
1.21 Initialise the importer with the given search 'path' - a list of
1.22 directories to search for Python modules. If the optional 'annotate'
1.23 parameter is set to a false value (unlike the default), no annotation
1.24 will be performed.
1.25 - false value (unlike the default), no instance fixing will be performed.
1.26 """
1.27
1.28 self.path = path or [os.getcwd()]
2.1 --- a/simplify/fixinstances.py Thu Jul 26 20:26:47 2007 +0200
2.2 +++ b/simplify/fixinstances.py Fri Jul 27 20:54:33 2007 +0200
2.3 @@ -21,9 +21,11 @@
2.4
2.5 --------
2.6
2.7 -To use this module, the easiest approach is to use the fix function:
2.8 +To use this module, the easiest approach is to use the fix and fix_structures
2.9 +functions:
2.10
2.11 -fix(module)
2.12 +fix_structures(module) # to fix the structures
2.13 +fix(module) # to fix references to the structures
2.14
2.15 The more complicated approach involves instantiating a Fixer object:
2.16
2.17 @@ -31,6 +33,7 @@
2.18
2.19 Then, applying the fixer to an existing module:
2.20
2.21 +fixer.process_structures(module)
2.22 fixer.process(module)
2.23 """
2.24
2.25 @@ -45,7 +48,8 @@
2.26 depth-first, and eliminates references to superfluous instances, replacing
2.27 them with those from each class's distinct list, if necessary.
2.28
2.29 - See the simplify.fixnames.Fixer class for a description of the
2.30 + See the simplify.fixnames.Fixer class for a description of the mechanisms
2.31 + used to deal with subprograms.
2.32 """
2.33
2.34 def __init__(self):
3.1 --- a/simplify/viewer.py Thu Jul 26 20:26:47 2007 +0200
3.2 +++ b/simplify/viewer.py Fri Jul 27 20:54:33 2007 +0200
3.3 @@ -117,7 +117,7 @@
3.4 .returns:hover > .popup,
3.5 .failure:hover > .popup
3.6 {
3.7 - display: block;
3.8 + display: block;
3.9 }
3.10
3.11 .summary-class {
3.12 @@ -1134,7 +1134,7 @@
3.13 for section, subsection, labels in info:
3.14 self.stream.write("<div class='%s'>\n" % section)
3.15 for label in labels:
3.16 - self.stream.write("<div class='%s'>\n" % subsection)
3.17 + self.stream.write("<div class='%s'>" % subsection)
3.18 self.stream.write(label)
3.19 self.stream.write("</div>\n")
3.20 self.stream.write("</div>\n")