Convert to Python3.

git-svn-id: http://www.winterrodeln.org/svn/wrpylib/trunk@2874 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/scripts/createthumbnails.py b/scripts/createthumbnails.py
index c126980f8f8e09bfed40add7d9f010636aba2825..53e7113f1960a98fbd91623656ad8d787c2c8859 100755 (executable)
--- a/scripts/createthumbnails.py
+++ b/scripts/createthumbnails.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.7
-# -*- coding: iso-8859-15 -*-
 """Creates the image thumbnails or icons for sledruns to be used in the sledmap application.
 Can be used in a python session or at the command line.
 
@@ -41,11 +39,10 @@ At the end, the following entries have to be present:
     sledrunicondir=/home/philipp/www/winterrodeln.org/karte/mediawiki_icons
 
 """
-from __future__ import division
+
 import argparse
-import sys
 import os
-import ConfigParser
+import configparser
 import hashlib
 import MySQLdb
 from PIL import Image, ImageFilter
@@ -93,7 +90,7 @@ def update_image_dir(mcon, mediawiki_image_dir, dest_dir, image_function, ignore
     sql = "select image from wrsledruncache where image is not null order by image"
     cu.execute(sql)
     for image, in cu:
-        image = image.replace(u' ', u'_')
+        image = image.replace(' ', '_')
         # Create md5sum out of the image filename
         md5 = hashlib.md5()
         md5.update(image.encode('UTF8'))
@@ -102,7 +99,7 @@ def update_image_dir(mcon, mediawiki_image_dir, dest_dir, image_function, ignore
         source_file = os.path.join(mediawiki_image_dir, hd[0], hd[0:2], image)
         dest_file = os.path.join(dest_dir, image)
         if ignore_existing and os.path.exists(dest_file): continue
-        print(u'{0}...'.format(image))
+        print(('{0}...'.format(image)))
         im = Image.open(source_file)
         im = image_function(im)
         im.save(dest_file, "JPEG")
@@ -114,7 +111,7 @@ def update_image_dir_by_inifile(inifile, mode):
     :param inifile: filename of an .ini file or a list of .ini files.
     :param mode: 'thumbnail' or 'icon'
     """
-    config = ConfigParser.SafeConfigParser()
+    config = configparser.ConfigParser()
     config.read(inifile)
 
     host = config.get('mysql', 'host')
@@ -142,4 +139,3 @@ if __name__=='__main__':
     args = parser.parse_args()
 
     update_image_dir_by_inifile(args.inifile, args.type)
-

diff --git a/scripts/updatewrinncache.py b/scripts/updatewrinncache.py
index 1f9c7b55677d9ebcf7356f83ca4366c0c9a324cd..36e8c9ea06f4836e982270bbe240893b84513be9 100755 (executable)
--- a/scripts/updatewrinncache.py
+++ b/scripts/updatewrinncache.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.7
-# -*- coding: iso-8859-15 -*-
 """Updates the wrsledrun table (by calling wrpylib.wrmwcache.update_wrinncache()).
 Can be used in a python session or at the command line.
 
@@ -17,7 +15,7 @@ At the end, the following entries have to be present:
 """
 
 import sys
-import ConfigParser
+import configparser
 from sqlalchemy.engine import create_engine
 import wrpylib.wrmwcache
 
@@ -26,7 +24,7 @@ def update_wrinncache(inifile):
     """
     :param inifile: filename of an .ini file or a list of .ini files.
     """
-    config = ConfigParser.SafeConfigParser()
+    config = configparser.ConfigParser()
     config.read(inifile)
 
     host = config.get('mysql', 'host')
@@ -34,7 +32,7 @@ def update_wrinncache(inifile):
     user = config.get('mysql', 'user_name')
     passwd = config.get('mysql', 'user_pass')
 
-    engine = create_engine(u'mysql://{user}@{host}:3306/{dbname}?charset=utf8&passwd={passwd}&use_unicode=0'.format(host=host, dbname=dbname, user=user, passwd=passwd))
+    engine = create_engine('mysql://{user}@{host}:3306/{dbname}?charset=utf8&passwd={passwd}&use_unicode=0'.format(host=host, dbname=dbname, user=user, passwd=passwd))
     # "use_unicode=0": see: https://sourceforge.net/tracker/?func=detail&aid=2837134&group_id=22307&atid=374932
     wrpylib.wrmwcache.update_wrinncache(engine.connect())
 
@@ -43,6 +41,5 @@ if __name__ == '__main__':
     if len(sys.argv) >= 2:
         update_wrinncache(sys.argv[1:])
     else:
-        print 'Usage:\n{0} infile1.ini [inifile2.ini ...]'.format(sys.argv[0])
-        print 'See: http://www.winterrodeln.org/trac/wiki/ConfigIni'
-
+        print('Usage:\n{0} infile1.ini [inifile2.ini ...]'.format(sys.argv[0]))
+        print('See: http://www.winterrodeln.org/trac/wiki/ConfigIni')

diff --git a/scripts/updatewrmapcache.py b/scripts/updatewrmapcache.py
index 2ea300d654c612bcc58a560781577c69ec8e7dff..7f08f034d85982b6071c66f535c798c8f5a3ec1e 100755 (executable)
--- a/scripts/updatewrmapcache.py
+++ b/scripts/updatewrmapcache.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.7
-# -*- coding: iso-8859-15 -*-
 """Updates the wrmappathcache and wrmappointcache tables (by calling wrpylib.wrmwcache.update_wrmapcache()).
 Can be used in a python session or at the command line.
 
@@ -17,7 +15,7 @@ At the end, the following entries have to be present:
 """
 
 import sys
-import ConfigParser
+import configparser
 from sqlalchemy.engine import create_engine
 import wrpylib.wrmwcache
 
@@ -26,7 +24,7 @@ def update_wrmapcache(inifile):
     """
     :param inifile: filename of an .ini file or a list of .ini files.
     """
-    config = ConfigParser.SafeConfigParser()
+    config = configparser.ConfigParser()
     config.read(inifile)
 
     host = config.get('mysql', 'host')
@@ -43,6 +41,6 @@ if __name__ == '__main__':
     if len(sys.argv) >= 2:
         update_wrmapcache(sys.argv[1:])
     else:
-        print 'Usage:\n{0} infile1.ini [inifile2.ini ...]'.format(sys.argv[0])
-        print 'See: http://www.winterrodeln.org/trac/wiki/ConfigIni'
+        print('Usage:\n{0} infile1.ini [inifile2.ini ...]'.format(sys.argv[0]))
+        print('See: http://www.winterrodeln.org/trac/wiki/ConfigIni')
 

diff --git a/scripts/updatewrregioncache.py b/scripts/updatewrregioncache.py
index 41270cae0c4d79a91af7ccc0d9b31e40997f0d29..6a0f39276ab0d6190b0edce6bfee27d292c40812 100755 (executable)
--- a/scripts/updatewrregioncache.py
+++ b/scripts/updatewrregioncache.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.7
-# -*- coding: iso-8859-15 -*-
 """
 usage: updatewrregioncache.py [-h] inifile [inifile ...]
 
@@ -14,7 +12,7 @@ optional arguments:
   -h, --help  show this help message and exit
 """
 import argparse
-import ConfigParser
+import configparser
 from sqlalchemy.engine import create_engine
 import wrpylib.wrmwcache
 
@@ -23,7 +21,7 @@ def update_wrregioncache(inifiles):
     """
     :param inifiles: list of .ini file names
     """
-    config = ConfigParser.SafeConfigParser()
+    config = configparser.ConfigParser()
     config.read(inifiles)
 
     host = config.get('mysql', 'host')
@@ -31,7 +29,7 @@ def update_wrregioncache(inifiles):
     user = config.get('mysql', 'user_name')
     passwd = config.get('mysql', 'user_pass')
 
-    engine = create_engine(u'mysql://{user}@{host}:3306/{dbname}?charset=utf8&passwd={passwd}&use_unicode=1'.format(host=host, dbname=dbname, user=user, passwd=passwd))
+    engine = create_engine('mysql://{user}@{host}:3306/{dbname}?charset=utf8&passwd={passwd}&use_unicode=1'.format(host=host, dbname=dbname, user=user, passwd=passwd))
     wrpylib.wrmwcache.update_wrregioncache(engine.connect())
 
 
@@ -41,6 +39,3 @@ if __name__=='__main__':
     args = parser.parse_args()
 
     update_wrregioncache(args.inifile)
-
-
-

diff --git a/scripts/updatewrreportcache.py b/scripts/updatewrreportcache.py
index f23ea7519ab7d5ee1e7a9260ec26d502880ef2ba..175e1ef831e7ebeca2a51ef29e9a8c168f3e6dd3 100755 (executable)
--- a/scripts/updatewrreportcache.py
+++ b/scripts/updatewrreportcache.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.7
-# -*- coding: iso-8859-15 -*-
 """Updates the wrreportcache table (by calling wrpylib.wrmwcache.update_wrreportcache()).
 Can be used in a python session or at the command line.
 
@@ -17,7 +15,7 @@ At the end, the following entries have to be present:
 """
 
 import sys
-import ConfigParser
+import configparser
 from sqlalchemy.engine import create_engine
 import wrpylib.wrmwcache
 
@@ -26,7 +24,7 @@ def update_wrreportcache(inifile):
     """
     :param inifile: filename of an .ini file or a list of .ini files.
     """
-    config = ConfigParser.SafeConfigParser()
+    config = configparser.ConfigParser()
     config.read(inifile)
 
     host = config.get('mysql', 'host')
@@ -43,6 +41,5 @@ if __name__ == '__main__':
     if len(sys.argv) >= 2:
         update_wrreportcache(sys.argv[1:])
     else:
-        print 'Usage:\n{0} infile1.ini [inifile2.ini ...]'.format(sys.argv[0])
-        print 'See: http://www.winterrodeln.org/trac/wiki/ConfigIni'
-
+        print('Usage:\n{0} infile1.ini [inifile2.ini ...]'.format(sys.argv[0]))
+        print('See: http://www.winterrodeln.org/trac/wiki/ConfigIni')

diff --git a/scripts/updatewrsledruncache.py b/scripts/updatewrsledruncache.py
index c28e9e16b60b29bfd216fdf71a951edfbb7762de..9205f0c6fa2ba0216208d05bd85b87ddefc0b39c 100755 (executable)
--- a/scripts/updatewrsledruncache.py
+++ b/scripts/updatewrsledruncache.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python2.7
-# -*- coding: iso-8859-15 -*-
 """Updates the wrsledrun table (by calling wrpylib.wrmwcache.update_wrsledruncache()).
 Can be used in a python session or at the command line.
 
@@ -17,7 +15,7 @@ At the end, the following entries have to be present:
 """
 
 import sys
-import ConfigParser
+import configparser
 from sqlalchemy.engine import create_engine
 import wrpylib.wrmwcache
 
@@ -26,7 +24,7 @@ def update_wrsledruncache(inifile):
     """
     :param inifile: filename of an .ini file or a list of .ini files.
     """
-    config = ConfigParser.SafeConfigParser()
+    config = configparser.ConfigParser()
     config.read(inifile)
 
     host = config.get('mysql', 'host')
@@ -34,7 +32,7 @@ def update_wrsledruncache(inifile):
     user = config.get('mysql', 'user_name')
     passwd = config.get('mysql', 'user_pass')
 
-    engine = create_engine(u'mysql://{user}@{host}:3306/{dbname}?charset=utf8&passwd={passwd}&use_unicode=0'.format(host=host, dbname=dbname, user=user, passwd=passwd))
+    engine = create_engine('mysql://{user}@{host}:3306/{dbname}?charset=utf8&passwd={passwd}&use_unicode=0'.format(host=host, dbname=dbname, user=user, passwd=passwd))
     # "use_unicode=0": see: https://sourceforge.net/tracker/?func=detail&aid=2837134&group_id=22307&atid=374932
     wrpylib.wrmwcache.update_wrsledruncache(engine.connect())
 
@@ -43,6 +41,5 @@ if __name__ == '__main__':
     if len(sys.argv) >= 2:
         update_wrsledruncache(sys.argv[1:])
     else:
-        print 'Usage:\n{0} infile1.ini [inifile2.ini ...]'.format(sys.argv[0])
-        print 'See: http://www.winterrodeln.org/trac/wiki/ConfigIni'
-
+        print('Usage:\n{0} infile1.ini [inifile2.ini ...]'.format(sys.argv[0]))
+        print('See: http://www.winterrodeln.org/trac/wiki/ConfigIni')