all file read/write will be utf-8 encoded (python2 not affected)

Author: s-n-g

devel/build_install_pyradio

@@ -434,12 +434,27 @@ done
 # echo "***** installing for user..."
 do_dev
 
+if [ "${TO_PYTHON}" == "2" ];
+then
+    tar czf pyradio.tar.gz pyradio
+    for a_file in pyradio/*.py
+    do
+        sed -i "/open/s/, encoding='utf-8'//" "${a_file}"
+    done
+fi
+
 if [ -e requirements.txt ];then
 	python"${TO_PYTHON}" -m pip install -r requirements.txt . || pip_error
 else
 	python"${TO_PYTHON}" -m pip install . || pip_error
 fi
 
+if [ "${TO_PYTHON}" == "2" ];
+then
+    tar xzf pyradio.tar.gz
+    rm pyradio.tar.gz
+fi
+
 do_undev
 
 if [ $? -eq 0 ]

pyradio/browser.py

@@ -1477,7 +1477,7 @@ def read_config(self):
         lines = []
         term_str = []
         try:
-            with open(self.config_file, 'r') as cfgfile:
+            with open(self.config_file, 'r', encoding='utf-8') as cfgfile:
                 lines = [line.strip() for line in cfgfile if line.strip() and not line.startswith('#') ]
 
         except:
@@ -1634,7 +1634,7 @@ def save_config(self,
                 txt += 'SEARCH_TERM = ' + asterisk + str(search_history[n]).replace('{u\'', '{\'').replace('u\'', '\'') + '\n'
 
         try:
-            with open(self.config_file, 'w') as cfgfile:
+            with open(self.config_file, 'w', encoding='utf-8') as cfgfile:
                 cfgfile.write(txt)
         except:
             if logger.isEnabledFor(logging.ERROR):

pyradio/common.py

@@ -60,7 +60,7 @@ def erase_curses_win(self, Y, X, beginY, beginX, char=' ', color=5):
 def is_rasberrypi():
     ''' Try to detest rasberry pi '''
     try:
-        with io.open('/sys/firmware/devicetree/base/model', 'r') as m:
+        with io.open('/sys/firmware/devicetree/base/model', 'r', encoding='utf-8') as m:
             if 'raspberry pi' in m.read().lower():
                 return True
     except Exception:

pyradio/config.py

@@ -20,6 +20,7 @@
 from .common import is_rasberrypi
 from .player import pywhich
 HAS_REQUESTS = True
+
 try:
     import requests
 except:
@@ -84,7 +85,6 @@ class PyRadioStations(object):
 
     playlist_recovery_result = 0
 
-    _open_string = [ "open(stationFile, 'r')", "open(stationFile, 'r', encoding='utf-8')" ]
     _open_string_id = 0
 
     jump_tag = -1
@@ -324,7 +324,7 @@ def save_last_playlist(self, sel):
         if llp[2]:
             # logger.error(f'llp = {llp} - saved = {self._last_opened_playlist_name}')
             try:
-                with open(lp, 'w') as f:
+                with open(lp, 'w', encoding='utf-8') as f:
                     writter = csv.writer(f)
                     writter.writerow(out_pl)
             except PermissionError:
@@ -475,7 +475,7 @@ def _get_playlist_abspath_from_data(self, stationFile=''):
 
     def _package_stations(self):
         ''' read package stations.csv file '''
-        with open(self.root_path, 'r') as cfgfile:
+        with open(self.root_path, 'r', encoding='utf-8') as cfgfile:
             for row in csv.reader(filter(lambda row: row[0]!='#', cfgfile), skipinitialspace=True):
                 if not row:
                     continue
@@ -511,7 +511,7 @@ def read_playlist_for_server(self, stationFile):
         out = []
         in_file = self._construct_playlist_path(stationFile)
         try:
-            with open(in_file, 'r') as cfgfile:
+            with open(in_file, 'r', encoding='utf-8') as cfgfile:
                 for row in csv.reader(filter(lambda row: row[0]!='#', cfgfile), skipinitialspace=True):
                     if not row:
                         continue
@@ -571,7 +571,7 @@ def read_playlist_file(
             prev_format = self._playlist_version
             self._read_playlist_version = self._playlist_version = self.PLAYLIST_HAS_NAME_URL
             self._reading_stations = []
-            with eval(self._open_string[self._open_string_id]) as cfgfile:
+            with open(stationFile, 'r', encoding='utf-8') as cfgfile:
                 try:
                     for row in csv.reader(filter(lambda row: row[0]!='#', cfgfile), skipinitialspace=True):
                         if not row:
@@ -625,7 +625,7 @@ def read_playlist_file(
                         remove(a_file)
                     except:
                         pass
-            with open(ver_file, 'a') as f:
+            with open(ver_file, 'a', encoding='utf-8') as f:
                 pass
 
         return self.number_of_stations
@@ -749,10 +749,7 @@ def save_playlist_file(self, stationFile=''):
         #    tmp_stations.append([ '# Find lots more stations at http://www.iheart.com' , '', '', '' ])
         #tmp_stations.reverse()
         try:
-            #with open(st_new_file, 'w') as cfgfile:
-            ''' Convert self._open_string to
-                open(st_new_file, 'w') '''
-            with eval(self._open_string[self._open_string_id].replace("'r'", "'w'").replace('stationFile','st_new_file')) as cfgfile:
+            with open(st_new_file, 'w', encoding='utf-8') as cfgfile:
                 writter = csv.writer(cfgfile)
                 for a_station in tmp_stations:
                     writter.writerow(self._format_playlist_row(a_station))
@@ -887,9 +884,7 @@ def append_station(self, params, stationFile=''):
                 logger.debug('Appending station to playlist: "{}"'.format(stationFile))
             try:
                 #with open(st_file, 'a') as cfgfile:
-                ''' Convert self._open_string to
-                    with open(st_file, 'a') '''
-                with eval(self._open_string[self._open_string_id].replace("'r'", "'a'").replace('stationFile','st_file')) as cfgfile:
+                with open(st_file, 'a', encoding='utf-8') as cfgfile:
                     writter = csv.writer(cfgfile)
                     writter.writerow(params)
                 return 0
@@ -927,7 +922,7 @@ def paste_station_to_named_playlist(self, a_station, a_playlist):
             while w_str.endswith(','):
                 w_str = w_str[:-1]
             try:
-                with open(a_playlist, 'a') as f:
+                with open(a_playlist, 'a', encoding='utf-8') as f:
                     f.write('\n' + w_str)
                 return 0
             except:
@@ -1096,7 +1091,7 @@ def append_to_register(self, register, station):
         string_to_write = ','.join(a_station) + '\n'
         with self._registers_lock:
             try:
-                with open(reg_file, 'a') as f:
+                with open(reg_file, 'a', encoding='utf-8') as f:
                     f.write(string_to_write)
             except:
                 if logger.isEnabledFor(logging.DEBUG):
@@ -1627,7 +1622,7 @@ def _read_notification_command(self):
         for i, n in enumerate(ns):
             if path.exists(n):
                 try:
-                    with open(n, 'r') as f:
+                    with open(n, 'r', encoding='utf-8') as f:
                         for line in f:
                             self._notification_command.append(line.replace('\n', '').strip())
                 except:
@@ -1772,7 +1767,7 @@ def _get_lock_file(self):
                 self.locked = True
         else:
             try:
-                with open(self._session_lock_file, 'w') as f:
+                with open(self._session_lock_file, 'w', encoding='utf-8') as f:
                     pass
             except:
                 pass
@@ -1849,12 +1844,12 @@ def _check_config_file(self, usr):
 
     def _convert_config_for_rasberrypi(self, package_config_file, user_config_file):
         lines = []
-        with open(package_config_file, 'r') as f:
+        with open(package_config_file, 'r', encoding='utf-8') as f:
             lines = [line.strip() for line in f]
         for i in range(len(lines)):
             if lines[i].startswith('player'):
                 lines[i] = 'player = mplayer,vlc,mpv'
-        with open(user_config_file, 'w') as f:
+        with open(user_config_file, 'w', encoding='utf-8') as f:
             f.write('\n'.join(lines) + '\n')
 
     def _validate_remote_control_server_ip(self, val):
@@ -1887,7 +1882,7 @@ def _validate_remote_control_server_ip(self, val):
     def read_config(self):
         lines = []
         try:
-            with open(self.config_file, 'r') as cfgfile:
+            with open(self.config_file, 'r', encoding='utf-8') as cfgfile:
                 lines = [line.strip() for line in cfgfile if line.strip() and not line.startswith('#') ]
 
         except:
@@ -2024,7 +2019,7 @@ def read_config(self):
         ''' read distro from package config file '''
         package_config_file = path.join(path.dirname(__file__), 'config')
         try:
-            with open(package_config_file, 'r') as pkg_config:
+            with open(package_config_file, 'r', encoding='utf-8') as pkg_config:
                 lines = [line.strip() for line in pkg_config if line.strip() and not line.startswith('#') ]
             for line in lines:
                 sp = line.split('=')
@@ -2073,8 +2068,9 @@ def get_last_playlist(self):
         '''
         playlist = ''
         lp = path.join(self.stations_dir, 'last_playlist')
+        print('lp = "{}"'.format(lp))
         if path.exists(lp):
-            with open(lp, 'r') as f:
+            with open(lp, 'r', encoding='utf-8') as f:
                 for row in csv.reader(filter(lambda row: row[0]!='#', f), skipinitialspace=True):
                     if not row:
                         continue
@@ -2364,7 +2360,7 @@ def save_config(self, from_command_line=False):
             calcf = self.bck_opts['calculated_color_factor']
 
         try:
-            with open(self.config_file, 'w') as cfgfile:
+            with open(self.config_file, 'w', encoding='utf-8') as cfgfile:
                 cfgfile.write(txt.format(
                     self.opts['player'][1],
                     self.opts['open_last_playlist'][1],
@@ -2469,7 +2465,7 @@ def is_blacklisted_terminal(self):
                 user_terminal = []
                 if path.exists(term_file):
                     try:
-                        with open(term_file, 'r') as term:
+                        with open(term_file, 'r', encoding='utf-8') as term:
                             user_terminals = term.read().splitlines()
                     except:
                         pass
@@ -3146,8 +3142,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
                     requests_response = requests.get(url, timeout=1)
                     requests_response.raise_for_status()
                     try:
-                        with open(w_path, 'w') as f:
-                            pass
+                        with open(w_path, 'w', encoding='utf-8') as f:
                             f.write(requests_response.text)
                         written = True
                     except:
@@ -3315,7 +3310,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
             else:
                 w_theme = a_theme
 
-            with open(self._ln, 'r') as jfile:
+            with open(self._ln, 'r', encoding='utf-8') as jfile:
                 jdata = json.load(jfile)
 
             lines = templates[self.theme_id].split('\n')
@@ -3325,7 +3320,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
 
             ret = True
             try:
-                with open(w_path, 'w') as out_file:
+                with open(w_path, 'w', encoding='utf-8') as out_file:
                     for n in lines:
                         out_file.write(n + '\n')
             except:
@@ -3602,7 +3597,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
             # for n in lines:
             #     logger.error(n)
             try:
-                with open(w_path, 'w') as out_file:
+                with open(w_path, 'w', encoding='utf-8') as out_file:
                     for n in lines:
                         out_file.write(n + '\n')
             except:
@@ -3633,7 +3628,7 @@ def _read_last_line_from_ln(self):
     def _read_theme_sh(self, theme_name):
         lines = {}
         in_theme = False
-        with open(self._theme_sh_executable, 'r') as f:
+        with open(self._theme_sh_executable, 'r', encoding='utf-8') as f:
             for line in f:
                 if in_theme:
                     l = line.replace('\n', '').split(': ')

pyradio/config_window.py

@@ -5,7 +5,7 @@
 import glob
 import csv
 from os import path, sep, remove
-from sys import platform
+from sys import platform, version_info
 
 from .common import *
 from .window_stack import Window_Stack_Constants
@@ -18,7 +18,6 @@
 import locale
 locale.setlocale(locale.LC_ALL, '')    # set your locale
 
-
 logger = logging.getLogger(__name__)
 
 def set_global_functions(global_functions):
@@ -2552,7 +2551,7 @@ def _get_result(self):
 
         stationFile = path.join(self._config_path, self._items[self._selected_playlist_id] + '.csv')
         self._select_playlist_error = 0
-        with open(stationFile, 'r') as cfgfile:
+        with open(stationFile, 'r', encoding='utf-8') as cfgfile:
             try:
                 for row in csv.reader(filter(lambda row: row[0] != '#', cfgfile), skipinitialspace=True):
                     if not row:
@@ -2809,7 +2808,7 @@ def _read_items(self):
         self._items = []
         stationFile = path.join(self._config_path, self._default_playlist + '.csv')
         if path.exists(stationFile):
-            with open(stationFile, 'r') as cfgfile:
+            with open(stationFile, 'r', encoding='utf-8') as cfgfile:
                 try:
                     for row in csv.reader(filter(lambda row: row[0] != '#', cfgfile), skipinitialspace=True):
                         if not row:

pyradio/edit.py

@@ -19,6 +19,7 @@
 
 logger = logging.getLogger(__name__)
 
+
 class PyRadioSearch(SimpleCursesLineEdit):
 
     _caption = 'Search'
@@ -1063,7 +1064,7 @@ def _act_on_file(self):
         self.new_file_name = path.join(self._to_path, self._widgets[0].string + '.csv')
         if self._create:
             try:
-                with open(self.new_file_name, 'wt'):
+                with open(self.new_file_name, 'w', encoding='utf-8'):
                     pass
             except:
                 return -2

pyradio/install.py

@@ -32,6 +32,7 @@
 VERSION = ''
 
 PY3 = sys.version[0] == '3'
+
 # import logging
 # logger = logging.getLogger(__name__)
 
@@ -340,10 +341,10 @@ def windows_put_devel_version():
         cur_dir = os.getcwd()
         copyfile(os.path.join(cur_dir, 'config.py'), os.path.join(cur_dir, 'config.py.dev'))
         try:
-            with open(os.path.join(cur_dir, 'config.py'), 'r') as con:
+            with open(os.path.join(cur_dir, 'config.py'), 'r', encoding='utf-8') as con:
                 lines = con.read()
             lines = lines.replace("git_description = ''", "git_description = '" + long_descr + "'")
-            with open(os.path.join(cur_dir, 'config.py'), 'w') as con:
+            with open(os.path.join(cur_dir, 'config.py'), 'w', encoding='utf-8') as con:
                 con.write(lines)
         except:
             print('Error: Cannot change downloaded files...\n       Please close all running programs and try again.')
@@ -583,7 +584,7 @@ def update_or_uninstall_on_windows(self, mode='update', from_pyradio=False, firs
                 self.ZIP_URL[0] = self.ZIP_URL[0] + VERSION + '.zip'
                 self.ZIP_DIR[0] += VERSION
         try:
-            with open(bat, "w") as b:
+            with open(bat, "w", encoding='utf-8') as b:
                 b.write('@ECHO OFF\n')
                 b.write('CLS\n')
                 b.write('python -m pip install --upgrade wheel 1>NUL 2>NUL\n')
@@ -726,10 +727,10 @@ def _change_git_discription_in_config_py(self):
         ''' change git_discription in pyradio/config.py '''
         if self._github_long_description is not None:
             try:
-                with open(os.path.join(self._install_dir, 'pyradio', 'config.py'), 'r') as con:
+                with open(os.path.join(self._install_dir, 'pyradio', 'config.py'), 'r', encoding='utf-8') as con:
                     lines = con.read()
                 lines = lines.replace("git_description = ''", "git_description = '" + self._github_long_description + "'")
-                with open(os.path.join(self._install_dir, 'pyradio', 'config.py'), 'w') as con:
+                with open(os.path.join(self._install_dir, 'pyradio', 'config.py'), 'w', encoding='utf-8') as con:
                     con.write(lines)
             except:
                 print('Error: Cannot change downloaded files...\n       Please close all running programs and try again.')
@@ -758,7 +759,7 @@ def _download_pyradio(self):
             except:
                 print('Error: PyRadio source code ZIP file is corrupt...\n')
                 sys.exit(1)
-        with open(os.path.join(self._dir, self.ZIP_DIR[self._package], 'DEV'), 'w') as b:
+        with open(os.path.join(self._dir, self.ZIP_DIR[self._package], 'DEV'), 'w', encoding='utf-8') as b:
             pass
         ''' DEBUG on linux
             get new install.py, copy.py (any py)