[or-cvs] r14561: Proper exception handling for future antigravity and with mo (check/trunk/cgi-bin)

[ioerror at seul.org]

Author: ioerror
Date: 2008-05-05 04:56:29 -0400 (Mon, 05 May 2008)
New Revision: 14561

Modified:
   check/trunk/cgi-bin/index.py
Log:
Proper exception handling for future antigravity and with more python like docstrings.


Modified: check/trunk/cgi-bin/index.py
===================================================================
--- check/trunk/cgi-bin/index.py	2008-05-05 08:32:54 UTC (rev 14560)
+++ check/trunk/cgi-bin/index.py	2008-05-05 08:56:29 UTC (rev 14561)
@@ -1,27 +1,34 @@
 #!/usr/bin/env python
+"""
+ TorCheck.py
 
-#
-# TorCheck.py
-#
-# https://check.torproject.org - rewritten in python
-#
-# By Jacob Appelbaum <jacob at appelbaum.net>
-# Written at ToorCon Seattle 2008 (Thanks for the great time h1kari!)
-# Thanks to Crispen for a power outlet :-)
-# 
-# Additional python suggestions from nickm
-# 
-# Best used with the Debian packages:
-#    python-dns
-#    libapache2-mod-python
-#    locales-all
-#
-# *   Copyright (c) 2008, Jacob Appelbaum   *
-# *  See LICENSE for licensing information  *
-#
+ https://check.torproject.org - originally in perl, rewritten in python
 
-# Unused for now
-# import antigravity
+ By Jacob Appelbaum <jacob at appelbaum.net>
+ Written at ToorCon Seattle 2008 (Thanks for the great time h1kari!)
+ Thanks to Crispen for a power outlet :-)
+ 
+ Additional python suggestions from nickm
+ 
+ Best used with the Debian packages:
+    python-dns
+    libapache2-mod-python
+    locales-all
+
+"""
+
+__program__ = 'TorCheck.py'
+__version__ = '20080505.00'
+__url__ = 'https://tor-svn.freehaven.net/svn/check/'
+__author__ = 'Jacob Appelbaum <jacob at appelbaum.net>'
+__copyright__ = 'Copyright (c) 2008, Jacob Appelbaum'
+__license__ = 'See LICENSE for licensing information'
+
+try:
+    from future import antigravity
+except ImportError:
+    antigravity = None
+
 import DNS 
 # This is pydns and can be downloaded from http://pydns.sourceforge.net/ 
 # Or use the Debian package listed above