[Docutils-checkins] SF.net SVN: docutils:[8126] trunk/docutils

[<mi...@us...>]

Revision: 8126
          http://sourceforge.net/p/docutils/code/8126
Author:   milde
Date:     2017-06-23 09:34:28 +0000 (Fri, 23 Jun 2017)
Log Message:
-----------
Add test for __version_info__, fix output of optional __version_details__.

Modified Paths:
--------------
    trunk/docutils/docutils/core.py
    trunk/docutils/docutils/frontend.py
    trunk/docutils/test/test__init__.py
    trunk/docutils/tools/quicktest.py

Modified: trunk/docutils/docutils/core.py
===================================================================
--- trunk/docutils/docutils/core.py	2017-06-23 06:41:27 UTC (rev 8125)
+++ trunk/docutils/docutils/core.py	2017-06-23 09:34:28 UTC (rev 8126)
@@ -279,9 +279,11 @@
             print >>self._stderr, ("""\
 Exiting due to error.  Use "--traceback" to diagnose.
 Please report errors to <doc...@li...>.
-Include "--traceback" output, Docutils version (%s [%s]),
+Include "--traceback" output, Docutils version (%s%s),
 Python version (%s), your OS type & version, and the
-command line used.""" % (__version__, __version_details__,
+command line used.""" % (__version__,
+                         docutils.__version_details__ and
+                         ' [%s]'%docutils.__version_details__ or '',
                          sys.version.split()[0]))
 
     def report_SystemMessage(self, error):

Modified: trunk/docutils/docutils/frontend.py
===================================================================
--- trunk/docutils/docutils/frontend.py	2017-06-23 06:41:27 UTC (rev 8125)
+++ trunk/docutils/docutils/frontend.py	2017-06-23 09:34:28 UTC (rev 8126)
@@ -570,8 +570,10 @@
 
     config_section = 'general'
 
-    version_template = ('%%prog (Docutils %s [%s], Python %s, on %s)'
-                        % (docutils.__version__, docutils.__version_details__,
+    version_template = ('%%prog (Docutils %s%s, Python %s, on %s)'
+                        % (docutils.__version__,
+                           docutils.__version_details__ and
+                           ' [%s]'%docutils.__version_details__ or '',
                            sys.version.split()[0], sys.platform))
     """Default version message."""
 

Modified: trunk/docutils/test/test__init__.py
===================================================================
--- trunk/docutils/test/test__init__.py	2017-06-23 06:41:27 UTC (rev 8125)
+++ trunk/docutils/test/test__init__.py	2017-06-23 09:34:28 UTC (rev 8126)
@@ -23,6 +23,16 @@
         err = docutils.ApplicationError(u'\u0169')
         self.assertEqual(unicode(err), u'\u0169')
 
+class VersionInfoTests(unittest.TestCase):
 
+    def test_version_info(self):
+        self.assertEqual(len(docutils.__version_info__), 6)
+        # self.assertEqual(type(docutils.__version_info__.major), int)
+        # self.assertEqual(type(docutils.__version_info__.minor), int)
+        # self.assertEqual(type(docutils.__version_info__.micro), int)
+        # self.assertEqual(type(docutils.__version_info__.releaselevel), str)
+        # self.assertEqual(type(docutils.__version_info__.serial), int)
+        # self.assertEqual(type(docutils.__version_info__.release), bool)
+
 if __name__ == '__main__':
     unittest.main()

Modified: trunk/docutils/tools/quicktest.py
===================================================================
--- trunk/docutils/tools/quicktest.py	2017-06-23 06:41:27 UTC (rev 8125)
+++ trunk/docutils/tools/quicktest.py	2017-06-23 09:34:28 UTC (rev 8126)
@@ -142,9 +142,10 @@
             usage()
             sys.exit()
         elif o in ['-V', '--version']:
-            sys.stderr.write('quicktest.py (Docutils %s [%s])\n' %
-                             (docutils.__version__, 
-                              docutils.__version_details__))
+            sys.stderr.write('quicktest.py (Docutils %s%s)\n' %
+                             (docutils.__version__,
+                              docutils.__version_details__ and
+                              ' [%s]'%docutils.__version_details__ or ''))
             sys.exit()
         elif o in ['-r', '--rawxml']:
             outputFormat = 'rawxml'
@@ -180,7 +181,7 @@
     EasyDialogs.Message("""\
 Use the next dialog to build a command line:
 
-1. Choose an output format from the [Option] list 
+1. Choose an output format from the [Option] list
 2. Click [Add]
 3. Choose an input file: [Add existing file...]
 4. Save the output: [Add new file...]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.