Add random.seed call before every random usage

fauxfactory/__init__.py

@@ -1,6 +1,24 @@
 # -*- coding: utf-8 -*-
 """Generate random data for your tests."""
 
+import datetime
+import random
+import re
+import string
+import sys
+import unicodedata
+import uuid
+import warnings
+
+from collections import Iterable
+from functools import wraps
+
+from fauxfactory.constants import (
+    HTML_TAGS, LOREM_IPSUM_TEXT,
+    MAX_YEARS, MIN_YEARS,
+    SCHEMES, SUBDOMAINS, TLDS, VALID_NETMASKS
+)
+
 __all__ = (
     'gen_alpha',
     'gen_alphanumeric',
@@ -28,24 +46,6 @@
     'gen_uuid',
 )
 
-import datetime
-import random
-import re
-import string
-import sys
-import unicodedata
-import uuid
-import warnings
-
-from collections import Iterable
-from fauxfactory.constants import (
-    HTML_TAGS, LOREM_IPSUM_TEXT,
-    MAX_YEARS, MIN_YEARS,
-    SCHEMES, SUBDOMAINS, TLDS, VALID_NETMASKS
-)
-from functools import wraps
-
-
 # Private Functions -----------------------------------------------------------
 
 
@@ -84,7 +84,7 @@ def _unicode_letters_generator():
         range_function = xrange  # pylint:disable=undefined-variable
     else:
         chr_function = chr
-        range_function = range
+        range_function = range  # pylint:disable=redefined-variable-type
 
     # Use sys.maxunicode instead of 0x10FFFF to avoid the exception below, in a
     # narrow Python build (before Python 3.3)
@@ -156,6 +156,7 @@ def gen_alpha(length=10):
     # Validate length argument
     _is_positive_int(length)
 
+    random.seed()
     output_string = u''.join(
         random.choice(string.ascii_letters) for i in range(length)
     )
@@ -175,6 +176,7 @@ def gen_alphanumeric(length=10):
     # Validate length argument
     _is_positive_int(length)
 
+    random.seed()
     output_string = u''.join(
         random.choice(
             string.ascii_letters + string.digits
@@ -218,6 +220,7 @@ def gen_choice(choices):
     if len(choices) == 1:
         return choices[0]
 
+    random.seed()
     return random.choice(choices)
 
 
@@ -234,6 +237,8 @@ def gen_cjk(length=10):
     # Validate length argument
     _is_positive_int(length)
 
+    random.seed()
+
     # Generate codepoints, then convert the codepoints to a string. The
     # valid range of CJK codepoints is 0x4E00 - 0x9FCC, inclusive. Python 2
     # and 3 support the `unichr` and `chr` functions, respectively.
@@ -257,6 +262,8 @@ def gen_cyrillic(length=10):
     # Validate length argument
     _is_positive_int(length)
 
+    random.seed()
+
     # Generate codepoints, then convert the codepoints to a string. The
     # valid range of Cyrillic codepoints is 0x410 - 0x4ff, inclusive. Python 2
     # and 3 support the `unichr` and `chr` functions, respectively.
@@ -299,6 +306,8 @@ def gen_date(min_date=None, max_date=None):
     # Check that max_date is not before min_date
     assert min_date < max_date
 
+    random.seed()
+
     # Pick a day between min and max dates
     diff = max_date - min_date
     days = random.randint(0, diff.days)
@@ -337,6 +346,8 @@ def gen_datetime(min_date=None, max_date=None):
     # Check that max_date is not before min_date
     assert min_date < max_date
 
+    random.seed()
+
     # Pick a time between min and max dates
     diff = max_date - min_date
     seconds = random.randint(0, diff.days * 3600 * 24 + diff.seconds)
@@ -402,6 +413,7 @@ def gen_integer(min_value=None, max_value=None):
     if not isinstance(max_value, integer_types) or max_value > _max_value:
         raise ValueError("\'%s\' is not a valid maximum." % max_value)
 
+    random.seed()
     value = random.randint(min_value, max_value)
 
     return value
@@ -494,6 +506,8 @@ def gen_latin1(length=10):
     for i in range(int(range2[0], 16), int(range2[1], 16)):
         output_array.append(i)
 
+    random.seed()
+
     if sys.version_info[0] == 2:
         output_string = u''.join(
             # pylint:disable=E0602
@@ -559,6 +573,9 @@ def gen_ipaddr(ip3=False, ipv6=False, prefix=()):
         raise ValueError(
             "Prefix {} is too long for this configuration".format(
                 repr(prefix)))
+
+    random.seed()
+
     if ipv6:
         # StackOverflow.com questions: generate-random-ipv6-address
         random_fields = [
@@ -595,6 +612,7 @@ def gen_mac(delimiter=':', multicast=None, locally=None):
 
     if delimiter not in [':', '-']:
         raise ValueError('Delimiter is not a valid option: %s' % delimiter)
+    random.seed()
     if multicast is None:
         multicast = bool(random.randint(0, 1))
     if locally is None:
@@ -646,6 +664,7 @@ def gen_netmask(min_cidr=1, max_cidr=31):
             'max_cidr must be less than {0}, but is {1}'
             .format(len(VALID_NETMASKS), max_cidr)
         )
+    random.seed()
     return VALID_NETMASKS[random.randint(min_cidr, max_cidr)]
 
 
@@ -661,6 +680,7 @@ def gen_numeric_string(length=10):
     # Validate length argument
     _is_positive_int(length)
 
+    random.seed()
     output_string = u''.join(
         random.choice(string.digits) for i in range(length)
     )
@@ -688,6 +708,7 @@ def gen_time():
 
     """
 
+    random.seed()
     return datetime.time(
         random.randint(0, 23),
         random.randint(0, 59),
@@ -752,6 +773,7 @@ def gen_utf8(length=10):
     # Validate length argument
     _is_positive_int(length)
 
+    random.seed()
     return u''.join([random.choice(UNICODE_LETTERS) for _ in range(length)])
 
 
@@ -780,6 +802,7 @@ def gen_html(length=10):
     # Validate length argument
     _is_positive_int(length)
 
+    random.seed()
     html_tag = random.choice(HTML_TAGS)
     output_string = u'<{0}>{1}</{2}>'.format(
         html_tag, gen_string("alpha", length), html_tag)

makefile

@@ -7,6 +7,7 @@ help:
 	@echo "  docs-clean    Remove documentation."
 	@echo "  docs-doctest  Check code samples in the documentation."
 	@echo "  docs-html     Compile documentation to HTML."
+	@echo "  flake         Run flake8."
 	@echo "  lint          Run flake8 and pylint."
 	@echo "  test          Run unit tests."
 	@echo "  test-all      Run unit tests and doctests, measure coverage."
@@ -20,8 +21,10 @@ docs-doctest:
 docs-html:
 	cd docs && $(MAKE) html
 
-lint:
+flake:
 	flake8 .
+
+lint: flake
 	pylint --reports=n --disable=I --ignore-imports=y fauxfactory docs/conf.py setup.py
 # pylint should also lint the tests/ directory.
 
@@ -39,7 +42,7 @@ publish:
 test:
 	$(UNITTEST_CMD) $(UNITTEST_ARGS)
 
-test-all: lint docs-doctest
+test-all: flake docs-doctest
 	coverage run -m $(UNITTEST_MOD) $(UNITTEST_ARGS)
 
-.PHONY: help docs-clean docs-doctest docs-html lint package package-clean publish test test-all
+.PHONY: help docs-clean docs-doctest docs-html flake lint package package-clean publish test test-all

setup.py

@@ -1,9 +1,10 @@
 """A setuptools-based script for installing FauxFactory."""
 # setuptools is preferred over distutils.
-from setuptools import find_packages, setup
 import codecs
 import os
 
+from setuptools import find_packages, setup
+
 
 def read(*paths):
     """Build a file path from *paths* and return the contents."""