Remove mentions of Python 2.7

.appveyor.yml

@@ -1,5 +1,5 @@
 ---
-image: Previous Visual Studio 2022
+image: Visual Studio 2022
 environment:
     matrix:
         - PYTHON: "C:\\Python312"
@@ -10,7 +10,7 @@ install:
     - copy %PYTHON%\python.exe %PYTHON%\python3.exe
     - SET PATH=%PYTHON%;%PYTHON%\Scripts;C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%
     - python3 -mpip install Pillow attrs configobj flake8 flake8-import-order
-        pycotap pygame pyinstaller pysol-cards random2 setuptools six
+        pycotap pygame pyinstaller pysol-cards setuptools six
         ttkthemes
     - perl -v
     - copy C:\msys64\mingw64\bin\mingw32-make.exe C:\msys64\mingw64\bin\make.exe
@@ -32,8 +32,8 @@ test_script:
     - gmake pretest
     - perl run-tests.pl
     - gmake rules
-    - gmake pot
-    - gmake mo
+    #- gmake pot
+    #- gmake mo
     - pyinstaller pysol.py --windowed --icon=data\pysol.ico
     - python3 setup.py install_data -d dist\pysol
     - appveyor DownloadFile https://sourceforge.net/projects/pysolfc/files/PySolFC-Cardsets/minimal/PySolFC-Cardsets--Minimal-3.0.0.tar.xz/download -FileName cardsets.tar.xz
@@ -51,7 +51,7 @@ test_script:
     # For reproducible builds:
     # See:  https://reproducible-builds.org/ .
     - SET FC_SOLVE_VER=5.20.0
-    - appveyor DownloadFile https://netix.dl.sourceforge.net/project/fc-solve/fc-solve/DO-NOT-USE--fc-solve-for-pysol/fc-solve-for-pysol--v%FC_SOLVE_VER%.zip -FileName fc-solve.zip
+    - appveyor DownloadFile https://sourceforge.net/projects/fc-solve/files/fc-solve/DO-NOT-USE--fc-solve-for-pysol/fc-solve-for-pysol--v%FC_SOLVE_VER%.zip -FileName fc-solve.zip
     - 7z x fc-solve.zip
     - move fcs-pysol dist\pysol\freecell-solver
     - 7z a -r pysol_win_dist.7z dist\pysol\

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install flake8 flake8-import-order \
-          attrs configobj pycotap pysol-cards random2 setuptools six
+          attrs configobj pycotap pysol-cards setuptools six
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
     - name: Lint with flake8
       run: |

.github/workflows/macos-package.yml

@@ -23,7 +23,7 @@ jobs:
       run: |
         python3 -m pip install --upgrade pip
         python3 -m pip install --no-binary=Pillow \
-          Pillow attrs configobj py2app pycotap pygame pysol-cards random2 setuptools six ttkthemes
+          Pillow attrs configobj py2app pycotap pygame pysol-cards setuptools six ttkthemes
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         brew install create-dmg
     - name: Get cardsets

.travis.yml

@@ -46,7 +46,7 @@ install:
     # Tests are failing for them sometimes
     - cpanm --notest Capture::Tiny IPC::System::Simple
     - cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace
-    - export PY_MODS='attrs configobj pycotap pysol-cards random2 setuptools six'
+    - export PY_MODS='attrs configobj pycotap pysol-cards setuptools six'
     - if test "$TRAVIS_OS_NAME" = "osx" ; then export PY_MODS="--no-binary=Pillow Pillow $PY_MODS" ; fi
     - sudo -H pip3 install --upgrade wheel
     - sudo -H pip3 install --upgrade $PY_MODS flake8 flake8-import-order

CONTRIBUTING.md

@@ -7,7 +7,7 @@ for general guidelines for contributing to open source.
 
 - The [GitHub Actions CI build](https://github.com/shlomif/PySolFC/actions) and [AppVeyor build](https://ci.appveyor.com/project/shlomif/pysolfc) (which also run the test suite) should pass on each commit.
 - Your contributions should be under [GPLv3+](https://en.wikipedia.org/wiki/GNU_General_Public_License#Version_3) or a [compatible free software licence](https://www.gnu.org/licenses/license-list.html#GPLCompatibleLicenses), but please don't put them under the [AGPL](https://en.wikipedia.org/wiki/Affero_General_Public_License), which adds additional restrictions.
-- The code should be compatible with both Python 2.7.x and Python 3.4.x-and-above.
+- The code should be compatible with Python 3.4.x-and-above.
 
 # How you can contribute
 
@@ -32,7 +32,7 @@ custom variants. It lives in the Edit menu.
 
 Otherwise, the games' sources live under
 [the pysollib/games/](pysollib/games/) directory in the repository, and are
-written in Python 2.7/3.x and you can try inheriting from an existing
+written in Python 3.x and you can try inheriting from an existing
 variant [class](https://en.wikipedia.org/wiki/Class_%28computer_programming%29).
 
 In addition to adding the game's source code, be sure to add the game's metadata.  At minimum, you should:

README.md

@@ -31,7 +31,7 @@ can be implemented.
 
 ## Requirements.
 
-- Python (2.7 or 3.x)
+- Python 3.x
 - Tkinter (Tcl/Tk 8.4 or later)
 
 - For sound support (optional)
@@ -118,21 +118,19 @@ per the instructions above.
 At the moment, this only works on POSIX (Linux, FreeBSD and similar) systems.
 Windows and Mac users - you'll need to chip in with a script for your system.
 
-#### 1 - Install build prerequisites: six, random2 and pysol-cards
+#### 1 - Install build prerequisites: six and pysol-cards
 
 This is kind of stupid and maybe it can be fixed in the future, but for now:
 
 ```
 pip install six
-pip install random2
 pip install pysol-cards
 ```
 
 You may want to use your OS distribution package system instead, for example:
 
 ```
-sudo apt-get install python-six
-sudo apt-get install python-random2
+sudo apt-get install python3-six
 ```
 
 For Pillow compilation, libjpeg headers and libraries need to be available:

buildozer/buildozer.spec

@@ -38,7 +38,7 @@ version.filename = %(source.dir)s/version.txt
 
 # (list) Application requirements
 # comma separated e.g. requirements = sqlite3,kivy
-requirements = python3,kivy,pysol-cards,random2,configobj,attrs
+requirements = python3,kivy,pysol-cards,configobj,attrs
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes

contrib/install-pysolfc.sh

@@ -6,7 +6,7 @@ PIP="${PKGTREE}/env/bin/pip"
 PYPROG="${PKGTREE}/env/bin/python"
 VERSION="$(env PYTHONPATH=`pwd` "$PYPROG" -c 'from pysollib.settings import VERSION ; print(VERSION)')"
 XZBALL="dist/PySolFC-${VERSION}.tar.xz"
-reqs=(pillow pygame random2 six)
+reqs=(pillow pygame six)
 
 make dist
 

html-src/howtoplay.html

@@ -129,4 +129,5 @@ to the main <i>data/tiles</i> or your home <i>~/.PySolFC/tiles</i> directory.
 <li> <i>Ctrl-I</i> - Change table tile
 <li> <i>Ctrl-U</i> - Play the next music song
 <li> <i>Ctrl-W</i> - Select game, using old game select window
+<li> <i>F5</i> - Refresh the game layout
 </ul>

pysollib/game/__init__.py

@@ -23,6 +23,7 @@
 
 
 import math
+import random
 import time
 import traceback
 from pickle import Pickler, Unpickler, UnpicklingError
@@ -67,8 +68,6 @@ from pysollib.settings import PACKAGE, TITLE, TOOLKIT, TOP_SIZE
 from pysollib.settings import VERSION, VERSION_TUPLE
 from pysollib.struct_new import NewStruct
 
-import random2
-
 import six
 from six import BytesIO
 from six.moves import range
@@ -3363,7 +3362,7 @@ class Game(object):
         game.random = construct_random(initial_seed)
         state = pload()
         if (game.random is not None and
-                not isinstance(game.random, random2.Random) and
+                not isinstance(game.random, random.Random) and
                 isinstance(state, int)):
             game.random.setstate(state)
         # if not hasattr(game.random, "origin"):

pysollib/gamedb.py

@@ -21,22 +21,13 @@
 #
 # ---------------------------------------------------------------------------##
 
+from importlib import util
+
 import pysollib.settings
 from pysollib.mfxutil import Struct, print_err
 from pysollib.mygettext import _, n_
 from pysollib.resource import CSI
 
-import six
-
-# Handle import of import library - different libraries are needed
-# for different Python versions.
-imp = None
-util = None
-try:
-    from importlib import util
-except ImportError:
-    util = None
-    import imp
 
 # ************************************************************************
 # * constants
@@ -661,13 +652,13 @@ class GameInfo(Struct):
                  ):
         #
         def to_unicode(s):
-            if isinstance(s, six.text_type):
+            if isinstance(s, str):
                 return s
             try:
-                s = six.text_type(s, 'utf-8')
+                s = str(s, 'utf-8')
             except UnicodeDecodeError as err:
                 print_err(err)
-                s = six.text_type(s, 'utf-8', 'ignore')
+                s = str(s, 'utf-8', 'ignore')
             return s
         ncards = decks * (len(suits) * len(ranks) + len(trumps))
         game_flags = game_type & ~1023
@@ -682,7 +673,7 @@ class GameInfo(Struct):
             short_name = to_unicode(short_name)
             if pysollib.settings.TRANSLATE_GAME_NAMES:
                 short_name = _(short_name)
-        if isinstance(altnames, six.string_types):
+        if isinstance(altnames, str):
             altnames = (altnames,)
         altnames = [to_unicode(n) for n in altnames]
         if pysollib.settings.TRANSLATE_GAME_NAMES:
@@ -918,12 +909,9 @@ def loadGame(modname, filename, check_game=False):
     # print "load game", modname, filename
     GAME_DB.check_game = check_game
     GAME_DB.current_filename = filename
-    if util is not None:
-        spec = util.spec_from_file_location(modname, filename)
-        module = util.module_from_spec(spec)
-        spec.loader.exec_module(module)
-    else:
-        imp.load_source(modname, filename)
+    spec = util.spec_from_file_location(modname, filename)
+    module = util.module_from_spec(spec)
+    spec.loader.exec_module(module)
 
     # execfile(filename, globals(), globals())
     GAME_DB.current_filename = None

pysollib/ui/tktile/menubar.py

@@ -994,6 +994,8 @@ class PysolMenubarTkCommon:
         self._bindKey(ctrl, "Up", self.mSelectPrevGameById)
         self._bindKey(ctrl, "Down", self.mSelectNextGameById)
 
+        self._bindKey("", "F5", self.refresh)
+
         if os.name == 'posix' and platform.system() != 'Darwin':
             self._bindKey('Alt-', 'F4', self.mQuit)
 
@@ -2024,6 +2026,11 @@ Unsupported game for import.
         self.game.endGame(bookmark=1)
         self.game.quitGame(bookmark=1)
 
+    def refresh(self, *event):
+        self.app.updateCardset()
+        self.game.endGame(bookmark=1)
+        self.game.quitGame(bookmark=1)
+
     #
     # toolbar support
     #

setup.py

@@ -71,11 +71,13 @@ kw = {
     'author': 'Skomoroh',
     'author_email': 'skomoroh@gmail.com',
     'description': 'a Python solitaire game collection',
+    'classifiers': [
+        'Programming Language :: Python :: 3',
+    ],
     'install_requires': [
         'attrs>=18.2.0',
         'configobj',
         'pysol_cards',
-        'random2',
         'six',
     ],
     'long_description': long_description,