1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -892,14 +892,14 @@
SET (found_python3 )
IF (NOT "${_PYTHON3}" STREQUAL "_PYTHON3-NOTFOUND")
SET (found_python3 "1")
- EXECUTE_PROCESS(COMMAND "python3" "-c" "import random2; import sys; sys.exit(0);" RESULT_VARIABLE _random2)
+ EXECUTE_PROCESS(COMMAND "python3" "-c" "import sys; sys.exit(0);" RESULT_VARIABLE _random2)
IF ("${_random2}" STREQUAL "0")
SET (found_python3_random2 "1")
ELSE()
SET (found_python3_random2)
MESSAGE (WARNING "Could not find the python3's random2 module - please install it.")
ENDIF ()
- EXECUTE_PROCESS(COMMAND "python3" "-c" "import six; import sys; sys.exit(0);" RESULT_VARIABLE _six)
+ EXECUTE_PROCESS(COMMAND "python3" "-c" "import sys; sys.exit(0);" RESULT_VARIABLE _six)
IF (NOT ("${_six}" STREQUAL "0"))
MESSAGE (FATAL_ERROR "Could not find the python3's six module - please install it.")
ENDIF ()
--- a/board_gen/find-freecell-deal-index.py
+++ b/board_gen/find-freecell-deal-index.py
@@ -9,7 +9,7 @@
import sys
from make_pysol_freecell_board import find_index_main, LCRandom31
-from six.moves import range
+import range
def find_ret(ints):
--- a/board_gen/make_pysol_freecell_board.py
+++ b/board_gen/make_pysol_freecell_board.py
@@ -8,7 +8,6 @@
#
# This code is inspired by PySol by Markus F.X.J. Oberhumer and others.
# See: http://pysolfc.sourceforge.net/ .
-import random2
import sys
from fc_solve_find_index_s2ints import createCards, Card, CardRenderer, \
find_index__board_string_to_ints, ms_rearrange
@@ -90,11 +89,11 @@
# * Mersenne Twister random number generator
-class MTRandom(RandomBase, random2.Random):
+class MTRandom(RandomBase, random.Random):
MAX_SEED = 100000000000000000000 # 20 digits
def setSeed(self, seed):
- random2.Random.__init__(self, seed)
+ random.Random.__init__(self, seed)
self.initial_state = self.getstate()
|
