Merge branch 'scott-master'

jashan-lco · Jun 23, 2011 · bb1c1fb · bb1c1fb
2 parents 634a5f8 + 613f3a6
commit bb1c1fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/get_docstring.py b/get_docstring.py
@@ -23,7 +23,7 @@ def get_docstring():
 
     file_list = glob.glob('*.[fF]')
 
-    print "{0} files found.".format(len(file_list))
+    print "%d files found." % len(file_list)
 
     for i,file_name in enumerate(file_list):
         f = open(file_name, "r")
@@ -35,7 +35,7 @@ def get_docstring():
         if len(matches.groups()) != 1: # there should be only one match
             raise ValueError, "More than one match for function name."
         name = matches.group()
-        print "Reading {0:10s} in {1}.".format(name, file_name)
+        print "Reading %10s in %s." % (name, file_name)
 
         doc = []
         inside = 0
@@ -55,8 +55,7 @@ def get_docstring():
 
         f.close()
 
-    print "{0} functions read from {1} files.".format(len(doc_dict),
-                                                     len(file_list))
+    print "%d functions read from %d files." % (len(doc_dict), len(file_list))
     return doc_dict
 
 if __name__ == "__main__":

diff --git a/test/test_slalib.py b/test/test_slalib.py
@@ -1,4 +1,4 @@
-import slalib as S
+from pyslalib import slalib as S
 import numpy as N
 import numpy.testing as T
 import math, unittest