removed no_random option; SF's Python doesn't seem to be broken anymore

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@2868 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

6 files changed, 4 insertions, 23 deletions

diff --git a/docutils/docs/user/config.txt b/docutils/docs/user/config.txt
index 5fe169011..07fa26460 100644
--- a/docutils/docs/user/config.txt
+++ b/docutils/docs/user/config.txt
@@ -590,12 +590,6 @@ The PEP/HTML Writer derives from the standard HTML Writer, and shares
 all settings defined in the `[html4css1 writer]`_ section.  The
 "[html4css1 writer]" section is processed before "[pep_html writer]".
 
-_`no_random`
-    Workaround for platforms which core-dump on "``import random``".
-
-    Default: random enabled (None).  Options: ``--no-random``
-    (hidden).
-
 _`pep_home`
     Home URL prefix for PEPs.
 
diff --git a/docutils/docutils/writers/pep_html.py b/docutils/docutils/writers/pep_html.py
index 54d269317..9305e6062 100644
--- a/docutils/docutils/writers/pep_html.py
+++ b/docutils/docutils/writers/pep_html.py
@@ -11,6 +11,7 @@ PEP HTML Writer.
 __docformat__ = 'reStructuredText'
 
 
+import random
 import sys
 import docutils
 from docutils import frontend, nodes, utils
@@ -31,12 +32,7 @@ class Writer(html4css1.Writer):
           {'default': '..', 'metavar': '<URL>'}),
          ('Home URL prefix for PEPs.  Default is "." (current directory).',
           ['--pep-home'],
-          {'default': '.', 'metavar': '<URL>'}),
-         # Workaround for SourceForge's broken Python
-         # (``import random`` causes a segfault).
-         (frontend.SUPPRESS_HELP,
-          ['--no-random'],
-          {'action': 'store_true', 'validator': frontend.validate_boolean}),))
+          {'default': '.', 'metavar': '<URL>'}),))
 
     settings_default_overrides = {'footnote_references': 'brackets'}
 
@@ -70,14 +66,10 @@ class Writer(html4css1.Writer):
         header = self.document[index]
         pepnum = header[0][1].astext()
         subs['pep'] = pepnum
-        if settings.no_random:
-            subs['banner'] = 0
-        else:
-            import random
-            subs['banner'] = random.randrange(64)
+        subs['banner'] = random.randrange(64)
         try:
             subs['pepnum'] = '%04i' % int(pepnum)
-        except:
+        except ValueError:
             subs['pepnum'] = pepnum
         subs['title'] = header[1][1].astext()
         subs['body'] = ''.join(
diff --git a/docutils/test/data/config_1.txt b/docutils/test/data/config_1.txt
index f94074a8a..0c513dc57 100644
--- a/docutils/test/data/config_1.txt
+++ b/docutils/test/data/config_1.txt
@@ -22,4 +22,3 @@ stylesheet-path: stylesheets/default.css
 template: pep-html-template
 stylesheet-path: stylesheets/pep.css
 python-home: http://www.python.org
-no-random: yes
diff --git a/docutils/test/data/config_old.txt b/docutils/test/data/config_old.txt
index fa07d6dab..53ab8cb70 100644
--- a/docutils/test/data/config_old.txt
+++ b/docutils/test/data/config_old.txt
@@ -11,4 +11,3 @@ stylesheet-path: stylesheets/default.css
 pep-template: pep-html-template
 pep-stylesheet-path: stylesheets/pep.css
 python-home: http://www.python.org
-no-random: 1
diff --git a/docutils/test/test_settings.py b/docutils/test/test_settings.py
index 2a17c6eef..bb0b87020 100755
--- a/docutils/test/test_settings.py
+++ b/docutils/test/test_settings.py
@@ -43,7 +43,6 @@ class ConfigFileTests(unittest.TestCase):
     settings = {
         'old': {'datestamp': '%Y-%m-%d %H:%M UTC',
                 'generator': 1,
-                'no_random': 1,
                 'python_home': 'http://www.python.org',
                 'source_link': 1,
                 'stylesheet': None,
@@ -51,7 +50,6 @@ class ConfigFileTests(unittest.TestCase):
                 'template': fixpath('data/pep-html-template')},
         'one': {'datestamp': '%Y-%m-%d %H:%M UTC',
                 'generator': 1,
-                'no_random': 1,
                 'python_home': 'http://www.python.org',
                 'record_dependencies': utils.DependencyList(),
                 'source_link': 1,
diff --git a/docutils/tools/docutils.conf b/docutils/tools/docutils.conf
index 6a26a1c59..d958a3844 100644
--- a/docutils/tools/docutils.conf
+++ b/docutils/tools/docutils.conf
@@ -14,4 +14,3 @@ footnote-references: brackets
 template: pep-html-template
 stylesheet-path: stylesheets/pep.css
 python-home: http://www.python.org
-no-random: true