python 3 support

dontsovcmc · dontsovcmc · commit 6dcb062c3e5c · 2018-09-12T01:22:26.000+03:00
diff --git a/emp_mos_api/examples/read_profile.py b/emp_mos_api/examples/read_profile.py
@@ -1,8 +1,15 @@
 # -*- coding: utf-8 -*-
+from __future__ import print_function
 import argparse
-from emp_mos_api.mos import MosAPI
+from emp_mos_api.mos import MosAPI, \
+    get_flat_name, get_flat_address, get_flat_paycode, get_flat_number, \
+    get_profile_firstname, get_profile_middlename, get_profile_lastname, \
+    get_profile_birthdate, get_profile_msisdn, get_profile_email
 
 
+# Код написан общим для python2, python3 синтаксисом благодаря
+# http://python-future.org/compatible_idioms.html
+
 if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(description='emp.mos.ru API')
@@ -26,24 +33,26 @@
 
     try:
         api.login(args.login, args.pwd)
-        profile = api.get_profile()
+        p = api.get_profile()
 
-        print u'ФИО: {} {} {}'.format(profile['firstname'], profile['middlename'], profile['lastname'])
-        print u'Дата рождения: {}'.format(profile['birthdate'])
-        print u'Телефон: {}'.format(profile['msisdn'])
-        print u'Эл. почта: {}'.format(profile['email'])
+        print('ФИО: ', get_profile_firstname(p),
+              ' ', get_profile_middlename(p),
+              ' ', get_profile_lastname(p))
+        print('Дата рождения: ', get_profile_birthdate(p))
+        print('Телефон: ', get_profile_msisdn(p))
+        print('Эл. почта: ', get_profile_email(p))
 
         flats = api.get_flats()
 
-        print u'Кол-во квартир: {}'.format(len(flats))
-        assert flats, u'Добавьте квартиру в приложении Госуслуги Москвы'
+        print('Кол-во квартир: ', len(flats))
+        assert flats, 'Добавьте квартиру в приложении Госуслуги Москвы'
 
         for f in flats:
-            print u'Квартира #{}'.format(flats.index(f) + 1)
-            print u'Название: {}'.format(f['name'])
-            print u'Адрес: {}'.format(f['address'])
-            print u'Номер кв: {}'.format(f['flat_number'])
-            print u'Номер платежки: {}'.format(f['paycode'])
+            print('Квартира #', flats.index(f) + 1)
+            print('Название: ', get_flat_name(f))
+            print('Адрес: ', get_flat_address(f))
+            print('Номер кв: ', get_flat_number(f))
+            print('Номер платежки: ', get_flat_paycode(f))
 
     finally:
         api.logout()
diff --git a/emp_mos_api/examples/read_watermeters.py b/emp_mos_api/examples/read_watermeters.py
@@ -1,7 +1,11 @@
 # -*- coding: utf-8 -*-
+from __future__ import print_function
 import argparse
-import datetime
-from emp_mos_api.mos import MosAPI, get_watercounters_id, get_watercounter_value
+from emp_mos_api.mos import MosAPI, \
+    get_flat_id, get_flat_address, get_flat_paycode, get_flat_number, \
+    get_watercounters_by_type, get_watermeter_last_value, \
+    get_watermeter_id, watermeter_new_value_json, get_watercounter_value, \
+    HOT_WATER, COLD_WATER
 
 
 if __name__ == "__main__":
@@ -34,52 +38,42 @@
         flats = api.get_flats()
         assert flats, u'Добавьте квартиру в приложении Госуслуги Москвы'
         f = flats[0]
-        print u'Адрес: {}'.format(f['address'])
-        print u'Номер кв: {}'.format(f['flat_number'])
-        print u'Номер платежки: {}'.format(f['paycode'])
+        print('Адрес: ', get_flat_address(f))
+        print('Номер кв:  ', get_flat_number(f))
+        print('Номер платежки: ', get_flat_paycode(f))
 
-        water = api.get_watercounters(f['flat_id'])
+        json_data = api.get_watercounters(get_flat_id(f))
 
         new_values = []
 
-        hot_ids = get_watercounters_id(u'ГВС', water)  # разбираем ответ
+        #
+        hots_json = get_watercounters_by_type(HOT_WATER, json_data) # разбираем ответ
 
-        if hot_ids:
-            hot_id = hot_ids[0]
-            hot_value = get_watercounter_value(hot_id, water)  # разбираем ответ
-            print 'Текущее показание горячей воды: {:.2f} m3'.format(hot_value)
+        if hots_json:
+            hot_value = get_watermeter_last_value(hots_json[0])
+            print('Текущее показание горячей воды: {:.2f} m3'.format(hot_value))
 
             if args.hot:
-                new_values.append({
-                    'counter_id': hot_id,
-                    'period': datetime.datetime.now().strftime("%Y-%m-%d"),
-                    'indication': '{:.2f}'.format(args.hot).replace('.', ',')
-                })
-                print 'Новое показание горячей воды: {:.2f} m3'.format(args.hot)
+                new_values.append(watermeter_new_value_json(get_watermeter_id(hots_json[0]), args.hot))
+                print('Новое показание горячей воды: {:.2f} m3'.format(args.hot))
         else:
-            print u'Не найден счетчик горячей воды'
+            print('Не найден счетчик горячей воды')
 
         #
-        cold_ids = get_watercounters_id(u'ХВС', water)
-
-        if cold_ids:
-            cold_id = cold_ids[0]
-            cold_value = get_watercounter_value(cold_id, water)
-            print 'Текущее показание холодной воды: {:.2f} m3'.format(cold_value)
+        colds_json = get_watercounters_by_type(COLD_WATER, json_data)
+        if colds_json:
+            cold_value = get_watermeter_last_value(colds_json[0])
+            print('Текущее показание холодной воды: {:.2f} m3'.format(cold_value))
 
             if args.cold:
-                new_values.append({
-                    'counter_id': cold_id,
-                    'period': datetime.datetime.now().strftime("%Y-%m-%d"),
-                    'indication': '{:.2f}'.format(args.cold).replace('.', ',')
-                })
-                print 'Новое показание холодной воды: {:.2f} m3'.format(args.cold)
+                new_values.append(watermeter_new_value_json(get_watermeter_id(colds_json[0]), args.cold))
+                print('Новое показание холодной воды: {:.2f} m3'.format(args.cold))
         else:
-            print u'Не найден счетчик холодной воды'
+            print('Не найден счетчик холодной воды')
 
         if new_values:
-            api.send_watercounters(f['flat_id'], new_values)
-            print 'Показания отправлены на сервер'
+            api.send_watercounters(get_flat_id(f), new_values)
+            print('Показания отправлены на сервер')
 
     finally:
         api.logout()
diff --git a/emp_mos_api/mos.py b/emp_mos_api/mos.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
+from __future__ import print_function
 import requests
-import datetime
-import argparse
+from datetime import datetime, tzinfo
 from copy import deepcopy
 
 
@@ -18,14 +18,20 @@ def check_error(answer):
     :return:
     """
     if answer['errorCode'] != 0:
-        raise Exception(u'Error code: {0}, message: {1}'.format(answer['errorCode'], answer['errorMessage']))
+        raise Exception('Error code: {0}, message: {1}'.format(answer['errorCode'], answer['errorMessage']))
 
 
+COLD_WATER = 1
+HOT_WATER = 2
+
 counter_types = {
-    1: u'ХВС',
-    2: u'ГВС'
+    COLD_WATER: 'ХВС',
+    HOT_WATER: 'ГВС'
 }
 
+COLD_WATER_TITLE_RUS = counter_types[COLD_WATER]
+HOT_WATER_TITLE_RUS = counter_types[HOT_WATER]
+
 
 class MosAPI(object):
 
@@ -110,7 +116,7 @@ def get_profile(self):
         """
         :return: JSON
         {
-        u'profile': {
+            u'profile': {
             u'drive_license': None,
             u'firstname': u'x',
             u'middlename': u'x',
@@ -260,7 +266,7 @@ def send_watercounters(self, flat_id, counters_data):
         :param counters_data: array of
             [{
                 'counter_id': u'123456', # ['counters'][0]['counterId']
-                'period': datetime.datetime.now().strftime("%Y-%m-%d"),
+                'period': datetime.now().strftime("%Y-%m-%d"),
                 'indication': 'xxx,xx'
             }, {
                 ...
@@ -314,28 +320,166 @@ def logout(self):
             return response['result']
 
 
-def get_watercounters_id(water_type, response):
+def get_profile_firstname(profile_json):
+    return profile_json['firstname']
+
+
+def get_profile_middlename(profile_json):
+    return profile_json['middlename']
+
+
+def get_profile_lastname(profile_json):
+    return profile_json['lastname']
+
+
+def get_profile_birthdate(profile_json):
+    return profile_json['birthdate']
+
+
+def get_profile_msisdn(profile_json):
+    return profile_json['msisdn']
+
+
+def get_profile_email(profile_json):
+    return profile_json['email']
+
+
+def get_flat_id(flat_json):
+    """
+    :param flat_json answer for api.get_flats()
+    :return:
+    """
+    return flat_json['flat_id']
+
+
+def get_flat_name(flat_json):
+    """
+    :param flat_json answer for api.get_flats()
+    :return:
+    """
+    return flat_json['name']
+
+
+def get_flat_address(flat_json):
+    """
+    :param flat_json answer for api.get_flats()
+    :return:
+    """
+    return flat_json['address']
+
+
+def get_flat_number(flat_json):
+    """
+    :param flat_json answer for api.get_flats()
+    :return:
+    """
+    return flat_json['flat_number']
+
+
+def get_flat_paycode(flat_json):
+    """
+    :param flat_json answer for api.get_flats()
+    :return:
     """
-    :param water_type: ГВС, ХВС
+    return flat_json['paycode']
+
+
+def get_watercounters_id(water_type_id, response):
+    """
+    :param water_type_id: COLD_WATER, HOT_WATER
     :param response: get_watercounters() response
     :return: array of int or NULL
     """
-    counters = filter(lambda x: counter_types[x['type']] == water_type, response['counters'])
+    counters = filter(lambda x: x['type'] == water_type_id, response['counters'])
     if counters:
         return list(c['counterId'] for c in counters)
 
 
+def get_watercounters_by_type(water_type_id, response):
+    """
+    :param water_type_id: COLD_WATER, HOT_WATER
+    :param response: get_watercounters() response
+    :return: response JSON array:
+        [{'counterId': 1437373,
+         'type': 1,
+         'num': '417944',
+         'checkup': '2023-09-25+03:00',
+         'indications':
+            [{'period': '2018-08-31+03:00', 'indication': '21.38'},
+             {'period': '2018-07-31+03:00', 'indication': '20.7'},
+             {'period': '2018-06-30+03:00', 'indication': '19'}]
+        },
+        {...}]
+    """
+    return list(filter(lambda x: x['type'] == water_type_id, response['counters']))
+
+
+def get_watercounter_by_id(id, response):
+    return list(filter(lambda x: x['counterId'] == id, response['counters']))[0]
+
+
+def get_counter_by_num(num, response):
+    """
+    :param num: Номер счетчика из приложения
+    :param response: JSON
+        {'counterId': 1437373,
+         'type': 1,
+         'num': '417944',
+         'checkup': '2023-09-25+03:00',
+         'indications':
+            [{'period': '2018-08-31+03:00', 'indication': '21.38'},
+             {'period': '2018-07-31+03:00', 'indication': '20.7'},
+             {'period': '2018-06-30+03:00', 'indication': '19'}]
+        }
+    :return:
+    """
+    return list(filter(lambda x: x['num'] == num, response['counters']))[0]
+
+
+def get_watermeter_last_value(counter):
+    """
+    :param counter: counter JSON from get_counter_by_num
+    :return: float
+    """
+    indications = counter['indications']
+    indications.sort(key=lambda x: x['period'])  # alphabetical sort data =)
+    assert indications, 'Нет показаний'
+    return float(indications[-1]['indication'])
+
+
+def get_watermeter_id(counter):
+    return counter['counterId']
+
+
+def get_watermeter_checkup(counter):
+    """
+    :param counter: counter JSON from get_counter_by_num
+                    'checkup': '2023-09-25+03:00'
+    :return: datetime с временной зоной
+    """
+    checkup = counter['checkup']
+    d = datetime.strptime(checkup, '%Y-%m-%d%z') #https://docs.python.org/3/library/datetime.html#datetime.timezone
+    return d  # Не будем приводить к UTC d.replace(tzinfo=None)
+
+
 def get_watercounter_value(counterId, response):
     """
     :param counterId: ['counters'][x]['counterId']
     :param response: get_watercounters() response
     :return: float
     """
-    for c in response['counters']:
-        if c['counterId'] == counterId:
-            if 'indications' in c:
-                indications = c['indications']
-                indications.sort(key=lambda x: x['period'])  # alphabetical sort data =)
-                assert indications
-                return float(indications[-1]['indication'])
+    c = get_watercounter_by_id(counterId, response)
+    return get_watermeter_last_value(c)
+
 
+def watermeter_new_value_json(counterId, value):
+    """
+    :param counterId: id счетчика. не номер из приложения!
+    :param value: значение float
+    :return: dict
+    """
+    return {
+        'counter_id': int(counterId),
+        'period': datetime.now().strftime("%Y-%m-%d"),
+        'indication': '{:.2f}'.format(value).replace('.', ',')
+    }
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,2 @@
-requests
+requests==2.19.1
+distro==1.3.0
diff --git a/setup.py b/setup.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-requests`
	`1`	`+requests==2.19.1`
	`2`	`+distro==1.3.0`