InPanel 1.2.5__tar.gz → 1.2.7__tar.gz

{inpanel-1.2.5 → inpanel-1.2.7}/InPanel.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.5
-Summary: InPanel - A Web-based Linux Server Management Tool
+Version: 1.2.7
+Summary: InPanel - A Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>
 License: BSD 3-Clause License

{inpanel-1.2.5 → inpanel-1.2.7}/InPanel.egg-info/SOURCES.txt

@@ -44,12 +44,14 @@ inpanel/mod/ftp.py
 inpanel/mod/httpd.py
 inpanel/mod/lighttpd.py
 inpanel/mod/login.py
+inpanel/mod/logs.py
 inpanel/mod/mysql.py
 inpanel/mod/named.py
 inpanel/mod/nginx.py
 inpanel/mod/package.py
 inpanel/mod/package_apt.py
 inpanel/mod/package_base.py
+inpanel/mod/package_brew.py
 inpanel/mod/package_dnf.py
 inpanel/mod/package_map.py
 inpanel/mod/package_yum.py
@@ -60,9 +62,11 @@ inpanel/mod/process.py
 inpanel/mod/proftpd.py
 inpanel/mod/pureftpd.py
 inpanel/mod/query.py
+inpanel/mod/redis.py
 inpanel/mod/remote.py
 inpanel/mod/server.py
 inpanel/mod/service.py
+inpanel/mod/service_manager.py
 inpanel/mod/setting.py
 inpanel/mod/shell.py
 inpanel/mod/ssh.py
@@ -87,12 +91,14 @@ inpanel/public/js/controllers/controllers.js
 inpanel/public/js/controllers/database.js
 inpanel/public/js/controllers/ecs.js
 inpanel/public/js/controllers/file.js
+inpanel/public/js/controllers/logs.js
 inpanel/public/js/controllers/plugins.js
 inpanel/public/js/controllers/service.js
 inpanel/public/js/controllers/site.js
 inpanel/public/js/controllers/utils.js
 inpanel/public/lib/angular/1.0.2/angular-resource.min.js
 inpanel/public/lib/angular/1.0.2/angular.min.js
+inpanel/public/lib/angular/1.0.8/angular.min.js
 inpanel/public/lib/bootstrap/css/bootstrap-theme.css
 inpanel/public/lib/bootstrap/css/bootstrap-theme.css.map
 inpanel/public/lib/bootstrap/css/bootstrap-theme.min.css
@@ -111,36 +117,59 @@ inpanel/public/lib/bootstrap/img/glyphicons-halflings.png
 inpanel/public/lib/bootstrap/js/bootstrap.js
 inpanel/public/lib/bootstrap/js/bootstrap.min.js
 inpanel/public/lib/bootstrap/js/npm.js
-inpanel/public/lib/codemirror/codemirror-compressed.js
-inpanel/public/lib/codemirror/codemirror.css
+inpanel/public/lib/codemirror/codemirror.min.css
+inpanel/public/lib/codemirror/codemirror.min.js
+inpanel/public/lib/codemirror/addon/edit/matchbrackets.min.js
+inpanel/public/lib/codemirror/addon/search/match-highlighter.min.js
+inpanel/public/lib/codemirror/addon/selection/active-line.min.js
+inpanel/public/lib/codemirror/mode/css/css.min.js
+inpanel/public/lib/codemirror/mode/diff/diff.min.js
+inpanel/public/lib/codemirror/mode/dockerfile/dockerfile.min.js
+inpanel/public/lib/codemirror/mode/go/go.min.js
+inpanel/public/lib/codemirror/mode/htmlmixed/htmlmixed.min.js
+inpanel/public/lib/codemirror/mode/javascript/javascript.min.js
+inpanel/public/lib/codemirror/mode/lua/lua.min.js
+inpanel/public/lib/codemirror/mode/markdown/markdown.min.js
+inpanel/public/lib/codemirror/mode/nginx/nginx.min.js
+inpanel/public/lib/codemirror/mode/perl/perl.min.js
+inpanel/public/lib/codemirror/mode/php/php.min.js
+inpanel/public/lib/codemirror/mode/properties/properties.min.js
+inpanel/public/lib/codemirror/mode/python/python.min.js
+inpanel/public/lib/codemirror/mode/ruby/ruby.min.js
+inpanel/public/lib/codemirror/mode/rust/rust.min.js
+inpanel/public/lib/codemirror/mode/shell/shell.min.js
+inpanel/public/lib/codemirror/mode/sql/sql.min.js
+inpanel/public/lib/codemirror/mode/toml/toml.min.js
+inpanel/public/lib/codemirror/mode/xml/xml.min.js
+inpanel/public/lib/codemirror/mode/yaml/yaml.min.js
 inpanel/public/lib/jquery/jquery-1.12.4.min.js
 inpanel/public/lib/md5/md5.js
 inpanel/public/lib/md5/md5.min.js
 inpanel/public/partials/ftp.html
-inpanel/public/partials/log.html
 inpanel/public/partials/login.html
 inpanel/public/partials/logout.html
+inpanel/public/partials/logs.html
 inpanel/public/partials/main.html
 inpanel/public/partials/secure.html
 inpanel/public/partials/setting.html
 inpanel/public/partials/sorry.html
 inpanel/public/partials/container/index.html
+inpanel/public/partials/container/directives/message.html
+inpanel/public/partials/container/directives/navbar.html
+inpanel/public/partials/container/directives/selector.html
+inpanel/public/partials/container/directives/srvbase.html
+inpanel/public/partials/container/directives/srvext.html
+inpanel/public/partials/container/directives/srvfile.html
+inpanel/public/partials/container/directives/srvinstall.html
+inpanel/public/partials/container/directives/srvlog.html
+inpanel/public/partials/container/directives/srvminiop.html
+inpanel/public/partials/container/directives/srvuninstall.html
+inpanel/public/partials/container/directives/srvupdate.html
 inpanel/public/partials/database/index.html
 inpanel/public/partials/database/mysql/dbedit.html
 inpanel/public/partials/database/mysql/dbnew.html
 inpanel/public/partials/database/mysql/useredit.html
 inpanel/public/partials/database/mysql/usernew.html
-inpanel/public/partials/directives/message.html
-inpanel/public/partials/directives/navbar.html
-inpanel/public/partials/directives/selector.html
-inpanel/public/partials/directives/srvbase.html
-inpanel/public/partials/directives/srvext.html
-inpanel/public/partials/directives/srvfile.html
-inpanel/public/partials/directives/srvinstall.html
-inpanel/public/partials/directives/srvlog.html
-inpanel/public/partials/directives/srvminiop.html
-inpanel/public/partials/directives/srvuninstall.html
-inpanel/public/partials/directives/srvupdate.html
 inpanel/public/partials/ecs/account.html
 inpanel/public/partials/ecs/ecs.html
 inpanel/public/partials/ecs/index.html
@@ -214,6 +243,19 @@ inpanel/public/partials/utils/user.html
 inpanel/public/templates/index.html
 inpanel/public/templates/file/preview.html
 inpanel/templates/__init__.py
+inpanel/templates/services/__init__.py
+inpanel/templates/services/_common.json
+inpanel/templates/services/categories.json
+inpanel/templates/services/database.json
+inpanel/templates/services/ftp.json
+inpanel/templates/services/http.json
+inpanel/templates/services/java.json
+inpanel/templates/services/mail.json
+inpanel/templates/services/nodejs.json
+inpanel/templates/services/php.json
+inpanel/templates/services/security.json
+inpanel/templates/services/storage.json
+inpanel/templates/services/system.json
 inpanel/templates/sources/__init__.py
 inpanel/templates/sources/apt.json
 inpanel/templates/sources/brew.json

{inpanel-1.2.5 → inpanel-1.2.7}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: InPanel
-Version: 1.2.5
-Summary: InPanel - A Web-based Linux Server Management Tool
+Version: 1.2.7
+Summary: InPanel - A Server Management Tool
 Author-email: Jackson Dou <jksdou@qq.com>
 Maintainer-email: Jackson Dou <jksdou@qq.com>
 License: BSD 3-Clause License

{inpanel-1.2.5 → inpanel-1.2.7}/inpanel/app.py

@@ -125,7 +125,7 @@ def cmd_start():
                 force_https = config.getboolean('server', 'forcehttps')
                 print(f'InPanel: running on: http{"s" if force_https else ""}://*:{server_port}')
             else:
-                print('InPanel: failed to start, check log file: %s' % logfile)
+                print(f'InPanel: failed to start, check log file: {logfile}')
                 sys.exit(1)
             return
     except OSError as e:
@@ -247,16 +247,16 @@ def cmd_uninstall(args=None):
     print('Uninstalling InPanel...')
 
     # 移除 systemd 服务
-    if os.path.exists(systemd_service):
+    if Path(systemd_service).exists():
         try:
             subprocess.run(['systemctl', 'stop', 'inpanel'], stderr=subprocess.DEVNULL)
             subprocess.run(['systemctl', 'disable', 'inpanel'], stderr=subprocess.DEVNULL)
         except Exception:
             pass
-        os.remove(systemd_service)
+        Path(systemd_service).unlink()
         print(f'  removed: {systemd_service}')
-    if os.path.exists(systemd_service_etc):
-        os.remove(systemd_service_etc)
+    if Path(systemd_service_etc).exists():
+        Path(systemd_service_etc).unlink()
         print(f'  removed: {systemd_service_etc}')
     try:
         subprocess.run(['systemctl', 'daemon-reload'], stderr=subprocess.DEVNULL)
@@ -264,7 +264,7 @@ def cmd_uninstall(args=None):
         pass
 
     # 移除 init.d 脚本
-    if os.path.exists(initd_script):
+    if Path(initd_script).exists():
         try:
             subprocess.run(['chkconfig', '--del', 'inpanel'], stderr=subprocess.DEVNULL)
         except Exception:
@@ -273,12 +273,12 @@ def cmd_uninstall(args=None):
             subprocess.run(['update-rc.d', '-f', 'inpanel', 'remove'], stderr=subprocess.DEVNULL)
         except Exception:
             pass
-        os.remove(initd_script)
+        Path(initd_script).unlink()
         print(f'  removed: {initd_script}')
 
     # 移除二进制文件 / 控制台脚本
-    if os.path.exists(bin_path):
-        os.remove(bin_path)
+    if Path(bin_path).exists():
+        Path(bin_path).unlink()
         print(f'  removed: {bin_path}')
 
     # 通过 pip 移除 Python 包
@@ -298,18 +298,18 @@ def cmd_uninstall(args=None):
                 print(f'  removed: {pkg_path}')
 
     # 移除配置文件（可选）
-    if purge_config and config_path and os.path.exists(config_path):
+    if purge_config and config_path and Path(config_path).exists():
         shutil.rmtree(config_path, ignore_errors=True)
         print(f'  removed: {config_path} (config files)')
 
     # 移除日志文件（可选）
-    if purge_logs and logging_path and os.path.exists(logging_path):
+    if purge_logs and logging_path and Path(logging_path).exists():
         shutil.rmtree(logging_path, ignore_errors=True)
         print(f'  removed: {logging_path} (log files)')
 
-    pidfile_dir = os.path.dirname(pidfile)
-    if os.path.exists(pidfile):
-        os.remove(pidfile)
+    pidfile_dir = str(Path(pidfile).parent)
+    if Path(pidfile).exists():
+        Path(pidfile).unlink()
 
     print()
     print('InPanel uninstalled successfully.')
@@ -381,8 +381,10 @@ def run_server():
         (r'/api/sources/pip/(.+?)(?:/(.+))?', web.RepoPipHandler),
         (r'/api/sources/docker/(.+?)(?:/(.+))?', web.RepoDockerHandler),
         (r'/api/sources/supported/?', web.RepoSupportedHandler),
+        (r'/api/service/(.+?)(?:/(.+))?', web.ServiceHandler),
         (r'/api/firewall/(.+)', web.FirewallHandler),
         (r'/api/setting/(.+)', web.SettingHandler),
+        (r'/api/logs/(.+)', web.LogsHandler),
         (r'/api/operation/(.+)', web.OperationHandler),
         (r'/api/task/(.+)', web.TaskHandler),
         (r'/api/sitepackage/(.+)', web.SitePackageHandler),

{inpanel-1.2.5 → inpanel-1.2.7}/inpanel/base.py

@@ -8,7 +8,6 @@
 '''InPanel 基础信息模块'''
 
 import sys
-import os
 from pathlib import Path
 from platform import mac_ver, platform, uname, win32_ver
 
@@ -41,7 +40,7 @@ __author__ = 'Jackson Dou'
 __license__ = 'BSD'
 
 app_name    = 'InPanel'
-releasetime = '2026-07-18'
+releasetime = '2026-07-26'
 DEBUG       = False
 COMMENTFLAG = '#INPANEL#'
 GENBY       = 'AUTOMATICALLY GENERATED BY INPANEL'
@@ -63,14 +62,15 @@ app_api = {
 }
 
 execfile       = '/usr/bin/inpanel'
-data_path      = '/var/lib/inpanel/'
 config_path    = '/etc/inpanel/'
+data_path      = '/var/lib/inpanel/'
+logging_path   = '/var/log/inpanel/'
 config_file    = '/etc/inpanel/config.ini'
 lastfile_path  = '/etc/inpanel/lastfile.ini'
 bookmarks_path = '/etc/inpanel/bookmarks.ini'
 upgrade_path   = '/etc/inpanel/upgrade.ini'
-history_path   = '/etc/inpanel/history.txt'
-logging_path   = '/var/log/inpanel/'
+files_log      = '/var/log/inpanel/files.log'
+filespath_log  = '/var/log/inpanel/filespath.log'
 logfile        = '/var/log/inpanel/main.log'
 logerror       = '/var/log/inpanel/error.log'
 pidfile        = '/var/run/inpanel.pid'
@@ -84,7 +84,11 @@ if hasattr(sys, 'frozen') and hasattr(sys, '_MEIPASS'):
     root_path = sys._MEIPASS
 else:
     package_dir = Path(__file__).parent.resolve()
+    is_develop_mode = False
     if package_dir.parts[-2] == 'site-packages' or 'dist-packages' in str(package_dir):
+        if Path(__file__).is_symlink():
+            is_develop_mode = True
+    if not is_develop_mode and (package_dir.parts[-2] == 'site-packages' or 'dist-packages' in str(package_dir)):
         run_type  = 'system'
         root_path = str(package_dir)
         pkg_str = str(package_dir)
@@ -102,12 +106,13 @@ else:
         execfile       = str(Path(root_path) / 'app.py')
         data_path      = str(Path(root_path) / 'data')
         config_path    = str(Path(root_path) / 'data')
+        logging_path   = str(Path(root_path) / 'data')
         config_file    = str(Path(root_path) / 'data' / 'config.ini')
         lastfile_path  = str(Path(root_path) / 'data' / 'lastfile.ini')
         bookmarks_path = str(Path(root_path) / 'data' / 'bookmarks.ini')
         upgrade_path   = str(Path(root_path) / 'data' / 'upgrade.ini')
-        history_path   = str(Path(root_path) / 'data' / 'history.txt')
-        logging_path   = str(Path(root_path) / 'data')
+        files_log      = str(Path(root_path) / 'data' / 'files.log')
+        filespath_log  = str(Path(root_path) / 'data' / 'filespath.log')
         logfile        = str(Path(root_path) / 'data' / 'main.log')
         logerror       = str(Path(root_path) / 'data' / 'error.log')
         pidfile        = str(Path(root_path) / 'data' / 'inpanel.pid')
@@ -200,7 +205,7 @@ __all__ = [
     'releasetime', 'version_info', 'server_info', 'os_name', 'os_title',
     'os_version', 'os_versint', 'os_platform', 'kernel_name', 'kernel_release',
     'kernel_version', 'hostname', 'machine', 'lastfile_path', 'bookmarks_path', 'upgrade_path',
-    'history_path', 'logfile', 'logerror', 'pidfile', 'processor'
+    'files_log', 'filespath_log', 'logfile', 'logerror', 'pidfile', 'processor'
 ]
 
 if __name__ == '__main__':

{inpanel-1.2.5 → inpanel-1.2.7}/inpanel/config.py

@@ -119,7 +119,7 @@ Examples:
             key = md5(randstr().encode('utf-8')).hexdigest()
             md5_password = md5(value.encode('utf-8')).hexdigest()
             pwd = hmac_new(key.encode('utf-8'), md5_password.encode('utf-8'), md5).hexdigest()
-            value = '%s:%s' % (pwd, key)
+            value = f'{pwd}:{key}'
             logger.info(f'Password hash generated, key length: {len(key)}, hash length: {len(pwd)}')
         
         result = config.set(section, option, value)

{inpanel-1.2.5 → inpanel-1.2.7}/inpanel/lib/filelock.py

@@ -21,7 +21,7 @@ class FileLock(object):
             the maximum timeout and the delay between each attempt to lock.
         """
         self.is_locked = False
-        self.lockfile = str(Path.cwd() / ("%s.lock" % file_name))
+        self.lockfile = str(Path.cwd() / (f"{file_name}.lock"))
         self.file_name = file_name
         self.timeout = timeout
         self.delay = delay

{inpanel-1.2.5 → inpanel-1.2.7}/inpanel/lib/pxssh.py

@@ -186,8 +186,8 @@ class pxssh (spawn):
         if self.force_password:
             ssh_options = ssh_options + ' ' + self.SSH_OPTS
         if port is not None:
-            ssh_options = ssh_options + ' -p %s'%(str(port))
-        cmd = "ssh %s -l %s %s" % (ssh_options, username, server)
+            ssh_options = ssh_options + f' -p {port!s}'
+        cmd = f"ssh {ssh_options} -l {username} {server}"
 
         # This does not distinguish between a remote server 'password' prompt
         # and a local ssh 'passphrase' prompt (for unlocking a private key).

{inpanel-1.2.5 → inpanel-1.2.7}/inpanel/mod/acme.py

@@ -14,7 +14,6 @@ from binascii import unhexlify
 from hashlib import sha256
 from json import dumps, loads
 from pathlib import Path
-import os
 from subprocess import PIPE, STDOUT, Popen
 from time import sleep
 
@@ -58,7 +57,7 @@ class ACME():
         proc = Popen(cmd_list, stdin=stdin, stdout=PIPE, stderr=PIPE)
         out, err = proc.communicate(cmd_input)
         if proc.returncode != 0:
-            raise IOError("{0}\n{1}".format(err_msg, err))
+            raise IOError(f"{err_msg}\n{err}")
         return out
 
     def _b64(self, b):
@@ -86,8 +85,7 @@ class ACME():
         if depth < 100 and code == 400 and res_data['type'] == 'urn:ietf:params:acme:error:badNonce':
             raise IndexError(res_data)  # 允许对无效 nonce 重试 100 次
         if code not in [200, 201, 204]:
-            raise ValueError("{0}:\nUrl: {1}\nData: {2}\nResponse Code: {3}\nResponse: {4}".format(
-                err_msg, url, data, code, res_data))
+            raise ValueError(f"{err_msg}:\nUrl: {url}\nData: {data}\nResponse Code: {code}\nResponse: {res_data}")
         return res_data, code, headers
 
     def _s_request(self, url, payload, err_msg, depth=0):
@@ -97,7 +95,7 @@ class ACME():
         protected = {'url': url, 'alg': self.alg, "nonce": new_nonce}
         protected.update({"jwk": self.jwk} if self.acct_headers is None else {"kid": self.acct_headers['Location']})
         protected64 = self._b64(dumps(protected).encode('utf8'))
-        protected_input = "{0}.{1}".format(protected64, payload64).encode('utf8')
+        protected_input = f"{protected64}.{payload64}".encode('utf8')
         cmd = ['openssl', 'dgst', '-sha256', '-sign', self.account_key]
         out = self._cmd(cmd, stdin=PIPE, cmd_input=protected_input, err_msg='OpenSSL Error')
         data = dumps({
@@ -147,8 +145,8 @@ class ACME():
         out = self._cmd(cmd, err_msg='openssl error')
         pub_pattern = r"modulus:\n\s+00:([a-f0-9\:\s]+?)\npublicExponent: ([0-9]+)"
         pub_hex, pub_exp = re.search(pub_pattern, out.decode('utf8'), re.MULTILINE | re.DOTALL).groups()
-        pub_exp = "{0:x}".format(int(pub_exp))
-        pub_exp = "0{0}".format(pub_exp) if len(pub_exp) % 2 else pub_exp
+        pub_exp = f"{int(pub_exp):x}"
+        pub_exp = f"0{pub_exp}" if len(pub_exp) % 2 else pub_exp
         self.jwk = {
             'e': self._b64(unhexlify(pub_exp.encode('utf-8'))),
             'kty': 'RSA',
@@ -183,7 +181,7 @@ class ACME():
         # 查找域名
         print('Domains CSR parsing...')
         cmd = ['openssl', 'req', '-in', self.csr, '-noout', '-text']
-        out = self._cmd(cmd, err_msg="Error loading {0}".format(self.csr))
+        out = self._cmd(cmd, err_msg=f"Error loading {self.csr}")
         domains = set([])
         common_name = re.search(r"Subject:.*? CN\s?=\s?([^\s,;/]+)", out.decode('utf8'))
         if common_name is not None:
@@ -194,7 +192,7 @@ class ACME():
             for san in subject_alt_names.group(1).split(", "):
                 if san.startswith("DNS:"):
                     domains.add(san[4:])
-        print("Found domains: {0}".format(", ".join(domains)))
+        print(f"Found domains: {', '.join(domains)}")
         # print('domains', domains)
         if order == True:
             self.create_new_order(domains)
@@ -214,32 +212,31 @@ class ACME():
         for auth_url in order['authorizations']:
             authorization, _, _ = self._request(auth_url, err_msg='Error getting challenges')
             domain = authorization['identifier']['value']
-            print("Domain {0} Verifying...".format(domain))
+            print(f"Domain {domain} Verifying...")
 
             # 找到 http-01 挑战并写入挑战文件
             challenge = [c for c in authorization['challenges'] if c['type'] == "http-01"][0]
             token = re.sub(r"[^A-Za-z0-9_\-]", "_", challenge['token'])
-            key_auth = "{0}.{1}".format(token, self.thumbprint)
+            key_auth = f"{token}.{self.thumbprint}"
             wellknown_path = str(Path(self.acme_check_dir) / token)
             with open(wellknown_path, 'w', encoding='utf-8') as f:
                 f.write(key_auth)
 
             # 检查 wellknown 文件是否在指定位置
             try:
-                wellknown_url = "http://{0}/.well-known/acme-challenge/{1}".format(domain, token)
+                wellknown_url = f"http://{domain}/.well-known/acme-challenge/{token}"
                 assert(disable_check or self._request(wellknown_url)[0] == key_auth)
             except (AssertionError, ValueError) as e:
-                os.remove(wellknown_path)
-                raise ValueError("Wrote file to {0}, but couldn't download {1}: {2}".format(
-                    wellknown_path, wellknown_url, e))
+                Path(wellknown_path).unlink()
+                raise ValueError(f"Wrote file to {wellknown_path}, but couldn't download {wellknown_url}: {e}")
 
             # 告知挑战已完成
             self._s_request(
-                challenge['url'], {}, "Error submitting challenges: {0}".format(domain))
-            authorization = self._poll_until_not(auth_url, ["pending"], "Error checking challenge status for {0}".format(domain))
+                challenge['url'], {}, f"Error submitting challenges: {domain}")
+            authorization = self._poll_until_not(auth_url, ["pending"], f"Error checking challenge status for {domain}")
             if authorization['status'] != "valid":
-                raise ValueError("Challenge did not pass for {0}: {1}".format(domain, authorization))
-            print("Domain {0} verified!".format(domain))
+                raise ValueError(f"Challenge did not pass for {domain}: {authorization}")
+            print(f"Domain {domain} verified!")
 
         # 使用 CSR 完成订单
         print('Certificate signing...')
@@ -248,7 +245,7 @@ class ACME():
         # 轮询订单以监控其完成状态
         order = self._poll_until_not(order_headers['Location'], ['pending', 'processing'], 'Error checking order status')
         if order['status'] != 'valid':
-            raise ValueError("Order failed: {0}".format(order))
+            raise ValueError(f"Order failed: {order}")
         self.certificate = order['certificate']
 
     def get_certificate(self, certificate=None):

{inpanel-1.2.5 → inpanel-1.2.7}/inpanel/mod/aliyuncs.py

@@ -32,8 +32,7 @@ class ECS(object):
     def _sign(self, params):
         paramstrings = []
         for k, v in sorted(params.items()):
-            paramstrings.append('%s=%s' %
-                                (ECS._urlencode(k), ECS._urlencode(v)))
+            paramstrings.append(f'{ECS._urlencode(k)}={ECS._urlencode(v)}')
         datastrings = [
             ECS._urlencode('GET'),
             ECS._urlencode('/'),
@@ -240,7 +239,7 @@ if __name__ == '__main__':
         print()
 
         for region in regions['Regions']:
-            print('## Zones in %s\n' % region['RegionCode'])
+            print(f"## Zones in {region['RegionCode']}\n")
             zones = ecs.DescribeZones(region['RegionCode'])
             if not zones[0]:
                 pp.pprint(zones)
@@ -250,7 +249,7 @@ if __name__ == '__main__':
             print()
 
             for zone in zones['Zones']:
-                print('## Instances in %s\n' % zone['ZoneCode'])
+                print(f"## Instances in {zone['ZoneCode']}\n")
                 instances = ecs.DescribeInstanceStatus(
                     region['RegionCode'], zone['ZoneCode'])[1]
                 pp.pprint(instances)