Changeset c2237e

Timestamp:

07/31/07 00:54:12 (6 years ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Children:

053fc5

Parents:

297f60

git-author:

Tiago de Paula Peixoto <tiago@…> (07/31/07 00:54:12)

git-committer:

Tiago de Paula Peixoto <tiago@…> (07/31/07 00:54:12)

Message:

        * src/graph-tool: added better error handling (output to stderr, cleaner information, return error status)  

        * src/graph/graph_bind.cc: added license info

        * src/graph-tool: added python metadata


git-svn-id: https://svn.forked.de/graph-tool/trunk@117 d4600afd-f417-0410-95de-beed9576f240

Files:

• ChangeLog (modified) (1 diff)
• src/graph-tool (modified) (5 diffs)
• src/graph/graph_bind.cc (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2007-07-30  Tiago de Paula Peixoto  <tiago@forked.de>
+
+    * src/graph-tool: added better error handling (output to stderr, cleaner information, return error status)  
+
+    * src/graph/graph_bind.cc: added license info
+
+    * src/graph-tool: added python metadata
+
 2007-07-29  Tiago de Paula Peixoto  <tiago@forked.de>
 

src/graph-tool

@@ -18 +18 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
+__author__="Tiago de Paula Peixoto <tiago@forked.de>"
+__copyright__="Copyright 2007 Tiago de Paula Peixoto"
+__license__="GPL version 3 or above"
+__URL__="http://graph-tool.forked.de"
+
 import sys
 
@@ -23 +28 @@
 
 from libgraph_tool import *
+__version__= mod_info().version
 
 from optparse import *
@@ -36 +42 @@
 import time
 import signal
+import traceback
 from time import *
 from math import *
@@ -831 +838 @@
             if len(expressions) > 1:
                 exec expressions[0] in edit_vars
-                exec open(os.path.expanduser(expressions[1].strip())).read() in edit_vars
-            else:
-                exec open(os.path.expanduser(expressions[0].strip())).read() in edit_vars    
+                exp_file = expressions[1]
+            else:
+                exp_file = expressions[0]            
+            exec open(os.path.expanduser(exp_file.strip())).read() in edit_vars
             edit_function = edit_vars["edit_function"]
         else:
@@ -1075 +1083 @@
             
 except (OptionError, HistoryException, IOError, RuntimeError), e:
-    print "graph-tool error:", e
+    print >> sys.stderr, "graph-tool error:", e
+    sys.exit(1)
 except KeyboardInterrupt:
-    pass
+    print >> sys.stderr, "graph-tool error: Keyboard interrupt."
+    sys.exit(1)
+except:
+    (file_name, line, function, text) = traceback.extract_tb(sys.exc_info()[2])[-1]
+    print >> sys.stderr, "graph-tool unknown error: ", sys.exc_info()[1], "[traceback: File %s, line %d, in %s (text: %s)]" % (file_name, line, function, str(text))
+    sys.exit(1)

src/graph/graph_bind.cc

@@ -206 +206 @@
     string GetCopyright() const {return COPYRIGHT;}
     string GetVersion()   const {return VERSION " (r" SVN_REVISION ")";}
+    string GetLicense()   const {return "GPL version 3 or above";}
 };
 
@@ -308 +309 @@
         .add_property("author", &LibInfo::GetAuthor)
         .add_property("copyright", &LibInfo::GetCopyright)
-        .add_property("version", &LibInfo::GetVersion);
+        .add_property("version", &LibInfo::GetVersion)
+        .add_property("license", &LibInfo::GetLicense);
 }