Use Python 3

varjoranta · varjoranta · commit 802e811e7da2 · 2019-01-28T16:33:11.000+01:00
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ a pull-request with missing prerequisites, if you test and confirm
 postgresql-metrics to work on other versions of the mentioned
 technologies.
 
-* Python 2.7
+* Python 3.5 or later
 * PostgreSQL 9.3 or later
 * Debian based distribution with systemd (packaging requirement only)
 
diff --git a/debian/control b/debian/control
@@ -3,14 +3,14 @@ Section: non-free/net
 Priority: extra
 Maintainer: Hannu Varjoranta <hannu.varjoranta@spotify.com>
 Build-Depends:
-  python (>= 2.7),
-  libpq-dev (<<9.7),
+  python3 (>= 3.5),
+  libpq-dev,
   debhelper (>= 9),
   dh-virtualenv (>= 1.0),
 Standards-Version: 3.9.5
-X-Python-Version: >= 2.7
+X-Python-Version: >= 3.5
 
 Package: postgresql-metrics
 Architecture: any
-Depends: ${misc:Depends}
+Pre-Depends: dpkg (>= 1.16.1), python3 (>= 3.5), ${misc:Pre-Depends}
 Description: Simple service to provide metrics for your PostgreSQL database
diff --git a/debian/postgresql-metrics.triggers b/debian/postgresql-metrics.triggers
@@ -0,0 +1 @@
+interest-noawait /usr/bin/python3
diff --git a/debian/rules b/debian/rules
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with python-virtualenv
+	dh $@ --with python-virtualenv --python python3 --preinstall=no-manylinux1
diff --git a/postgresql_metrics/common.py b/postgresql_metrics/common.py
@@ -16,7 +16,6 @@
 """
 
 import os
-import types
 
 import logbook
 import yaml
@@ -27,7 +26,7 @@ def get_logger(logger_name="postgresql-metrics"):
 
 
 def figure_out_log_level(given_level):
-    if isinstance(given_level, types.StringTypes):
+    if isinstance(given_level, str):
         return logbook.lookup_level(given_level.strip().upper())
     else:
         return given_level
@@ -83,7 +82,7 @@ def merge_configs(to_be_merged, default):
      ['get_stats_seconds_since_last_vacuum_per_table', 60]]
     """
     if isinstance(to_be_merged, dict) and isinstance(default, dict):
-        for k, v in default.iteritems():
+        for k, v in default.items():
             if k not in to_be_merged:
                 to_be_merged[k] = v
             else:
@@ -113,7 +112,7 @@ def find_and_parse_config(config_path):
     for config_dir in (default_root, config_root):
         current_path = os.path.join(config_dir, config_filename)
         if os.path.isfile(current_path):
-            with file(current_path, 'r') as f:
+            with open(current_path, 'r') as f:
                 read_config_dict = yaml.load(f)
             config_dict = merge_configs(read_config_dict, config_dict)
     return config_dict
diff --git a/postgresql_metrics/metrics_gatherer.py b/postgresql_metrics/metrics_gatherer.py
@@ -106,7 +106,7 @@ def get_stats_heap_hit_statistics(db_connection):
 def get_stats_lock_statistics(db_connection):
     locks_by_type, [total_locks_waiting, total_locks_granted] = get_lock_statistics(db_connection)
     metrics = []
-    for lock_type, [locks_waiting, locks_granted] in locks_by_type.iteritems():
+    for lock_type, [locks_waiting, locks_granted] in locks_by_type.items():
         metrics.append(metric_locks_granted(lock_type, locks_granted))
         metrics.append(metric_locks_waiting(lock_type, locks_waiting))
     metrics.append(metric_locks_granted("total", total_locks_granted))
diff --git a/postgresql_metrics/metrics_logic.py b/postgresql_metrics/metrics_logic.py
@@ -27,7 +27,7 @@
 import socket
 import time
 
-import metrics_gatherer
+from postgresql_metrics import metrics_gatherer
 from postgresql_metrics.postgres_queries import (
     get_db_name_from_connection,
     get_db_connection,
@@ -62,7 +62,7 @@ def push_to_ffwd(metric_dicts, ffwd_addr, data_formatter=json.dumps):
         for metric in metric_dicts:
             data = data_formatter(metric)
             LOG.debug('send UDP packet to {} with data:\n{}', ffwd_addr, data)
-            s.sendto(data, ffwd_addr)
+            s.sendto(bytes(data, 'UTF-8'), ffwd_addr)
     finally:
         s.close()
 
@@ -283,10 +283,10 @@ def main():
         init_logging_stderr(log_level)
         db_connections = get_db_connections_with_conf(conf)
         get_all_metrics_now(db_connections, conf)
-        print "# sleep 5 s to get diffs on derivative metrics"
+        print("# sleep 5 s to get diffs on derivative metrics")
         time.sleep(5.0)
         for metric in get_all_metrics_now(db_connections, conf):
-            print metric
+            print(metric)
 
     elif args.command == 'long-running-ffwd':
         if conf['log']['log_to_stderr'] is True:
diff --git a/postgresql_metrics/prepare_db.py b/postgresql_metrics/prepare_db.py
@@ -37,8 +37,8 @@
 
 
 def query_user_for_superuser_credentials():
-    username = raw_input("Provide a Postgres role name with superuser privileges "
-                         "in the configured cluster: ")
+    username = input("Provide a Postgres role name with superuser privileges "
+                     "in the configured cluster: ")
     password = getpass.getpass("Give the password: ")
     return username, password
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-psycopg2>=2.6.1
+psycopg2-binary>=2.6.1
 logbook>=0.10.1
 pip>=1.5.4
 pyyaml>=3.11
