From bd1e6580804dac9b4ab6381a01285070a93a6d04 Mon Sep 17 00:00:00 2001
From: Alexander Kukushkin <alexander.kukushkin@zalando.de>
Date: Fri, 17 Jun 2016 12:18:41 +0200
Subject: [PATCH] Bugfix: obviously sys.hexversion was one symbol shorter

plus remove some unneeded code
---
 patroni/api.py                  |  2 +-
 patroni/ctl.py                  |  2 +-
 patroni/scripts/wale_restore.py |  2 +-
 patroni/utils.py                | 24 +-----------------------
 tests/test_postgresql.py        |  4 +++-
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/patroni/api.py b/patroni/api.py
index 7000fc2f..b87711b2 100644
--- a/patroni/api.py
+++ b/patroni/api.py
@@ -4,7 +4,7 @@ import json
 import logging
 import psycopg2
 import time
-import dateutil
+import dateutil.parser
 import datetime
 import pytz
 
diff --git a/patroni/ctl.py b/patroni/ctl.py
index 26fef782..a0f0c565 100644
--- a/patroni/ctl.py
+++ b/patroni/ctl.py
@@ -5,7 +5,7 @@ Patroni Control
 import base64
 import click
 import datetime
-import dateutil
+import dateutil.parser
 import json
 import logging
 import os
diff --git a/patroni/scripts/wale_restore.py b/patroni/scripts/wale_restore.py
index f3691907..4383e986 100755
--- a/patroni/scripts/wale_restore.py
+++ b/patroni/scripts/wale_restore.py
@@ -33,7 +33,7 @@ import sys
 import argparse
 
 
-if sys.hexversion >= 0x03000000:
+if sys.hexversion >= 0x0300000:
     long = int
 
 logger = logging.getLogger(__name__)
diff --git a/patroni/utils.py b/patroni/utils.py
index 89ef7804..9c7a9e9d 100644
--- a/patroni/utils.py
+++ b/patroni/utils.py
@@ -1,39 +1,17 @@
-import datetime
 import os
 import random
 import sys
 import time
-import pytz
-import dateutil.parser
 
 from patroni.exceptions import PatroniException
 
-if sys.hexversion >= 0x03000000:
+if sys.hexversion >= 0x0300000:
     long = int
 
 __interrupted_sleep = False
 __reap_children = False
 
 
-def calculate_ttl(expiration):
-    """
-    >>> calculate_ttl(None)
-    >>> calculate_ttl('2015-06-10 12:56:30.552539016Z') < 0
-    True
-    >>> calculate_ttl('2015-06-10T12:56:30.552539016Z') < 0
-    True
-    >>> calculate_ttl('fail-06-10T12:56:30.552539016Z')
-    """
-    if not expiration:
-        return None
-    try:
-        expiration = dateutil.parser.parse(expiration)
-    except (ValueError, TypeError):
-        return None
-    now = datetime.datetime.now(pytz.utc)
-    return int((expiration - now).total_seconds())
-
-
 def deep_compare(obj1, obj2):
     """
     >>> deep_compare({'1': None}, {})
diff --git a/tests/test_postgresql.py b/tests/test_postgresql.py
index ec0151a2..42dcab0a 100644
--- a/tests/test_postgresql.py
+++ b/tests/test_postgresql.py
@@ -336,7 +336,9 @@ class TestPostgresql(unittest.TestCase):
 
     @patch('os.path.isfile', Mock(return_value=True))
     @patch('os.kill', Mock(side_effect=Exception))
-    @patch.object(builtins, 'open', mock_open(read_data='-999999999999999'))
+    @patch('os.getpid', Mock(return_value=2))
+    @patch('os.getppid', Mock(return_value=2))
+    @patch.object(builtins, 'open', mock_open(read_data='-1'))
     @patch.object(Postgresql, '_version_file_exists', Mock(return_value=True))
     def test_is_running(self):
         self.assertFalse(self.p.is_running())