Python3 support

.travis.yml

@@ -5,8 +5,6 @@ python:
   - "3.6"
 matrix:
   fast_finish: true
-  allow_failures:
-    - python: "3.6"
 install:
   - "pip install ."
   - if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi

gestionatr/cli.py

@@ -1,4 +1,6 @@
 # -*- encoding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
+import six
 import sys
 import click
 
@@ -29,24 +31,24 @@ def atr():
 @click.option("--filename", "-f", help="path to XML filename", required=True)
 @click.option("--sector", "-s", help="e (power) or g (gas)", default="e")
 def test(filename, sector):
-    with open(filename, 'r') as xml_file:
+    with open(filename, 'rb') as xml_file:
         try:
             data = xml_file.read()
-            if sector == u'e':
+            if sector == 'e':
                 m = message.Message(data)
-            elif sector == u'g':
+            elif sector == 'g':
                 m = message_gas.MessageGas(data)
             m.parse_xml()
-            sys.stdout.write(u'Correct File\n')
+            sys.stdout.write('Correct File\n')
         except except_f1 as e:
-            error_txt = unicode(e.value).encode(errors='ignore')
+            error_txt = six.text_type(e.value).encode(errors='ignore')
             sys.stdout.write(
-                u'WARNING: Invalid File: {0}\n'.format(error_txt)
+                'WARNING: Invalid File: {0}\n'.format(error_txt)
             )
         except Exception as e:
-            error_txt = unicode(e).encode(errors='ignore')
+            error_txt = six.text_type(e).encode(errors='ignore')
             sys.stdout.write(
-                u'WARNING: Invalid File: {0}\n'.format(error_txt)
+                'WARNING: Invalid File: {0}\n'.format(error_txt)
             )
         finally:
             sys.stdout.flush()

gestionatr/defs.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
 
 # Mapeig de distribuïdores
 provincies_arago = ['22', '44', '50']  # Osca, Terol, Saragossa

gestionatr/defs_gas.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from defs import SUBTYPES_R101
+from __future__ import absolute_import, unicode_literals
+from .defs import SUBTYPES_R101
 
 TAULA_CATEGORIA_SUJETO = [
     ('COM', 'Comercializadora'),

gestionatr/helpers/__init__.py

@@ -1,2 +1,3 @@
 # -*- coding: utf-8 -*-
-from funcions import *
+from __future__ import absolute_import
+from .funcions import *

gestionatr/helpers/funcions.py

@@ -3,6 +3,8 @@
 """Helper functions for libComXml
 """
 
+from __future__ import absolute_import, unicode_literals
+
 CODIS_REFACT = {'RT42011': '40',
                 'RT12012': '41',
                 'RM42012': '42'}

gestionatr/input/messages/A1.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from message import Message
-from Deadlines import ProcessDeadline
+from __future__ import absolute_import, unicode_literals
+from .message import Message
+from .Deadlines import ProcessDeadline
 from gestionatr.input.messages import except_f1
-from D1 import DatosInstGen, DatosSuministro, Autoconsumo
+from .D1 import DatosInstGen, DatosSuministro, Autoconsumo
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/A12_26.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from message_gas import MessageGas
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .message_gas import MessageGas
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
-from A1_46 import *
+from .A1_46 import *
 
 
 class A12_26(A1_46):

gestionatr/input/messages/A19_45.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from message_gas import MessageGas
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .message_gas import MessageGas
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
-from A12_26 import *
+from .A12_26 import *
 
 
 class A19_45(A12_26):

gestionatr/input/messages/A1_02.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from A1_41 import *
+from __future__ import absolute_import, unicode_literals
+from .A1_41 import *
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/A1_03.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from A1_44 import *
+from __future__ import absolute_import, unicode_literals
+from .A1_44 import *
 
 
 class A1_03(A1_44):

gestionatr/input/messages/A1_04.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
 from gestionatr.utils import get_rec_attr
-from A1_44 import A1_44
+from .A1_44 import A1_44
 
 
 class A1_04(A1_44):

gestionatr/input/messages/A1_05.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from A1_02 import *
+from __future__ import absolute_import, unicode_literals
+from .A1_02 import *
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/A1_41.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-from message_gas import MessageGas
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .message_gas import MessageGas
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/A1_44.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from message_gas import MessageGas
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .message_gas import MessageGas
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
-from A1_05 import *
+from .A1_05 import *
 
 
 class A1_44(A1_05):

gestionatr/input/messages/A1_46.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from message_gas import MessageGas
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .message_gas import MessageGas
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
-from A1_48 import *
+from .A1_48 import *
 
 
 class A1_46(A1_48):

gestionatr/input/messages/A1_48.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from message_gas import MessageGas
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .message_gas import MessageGas
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
-from A1_04 import *
+from .A1_04 import *
 from gestionatr.defs_gas import SUBTYPES_A1_48
 
 

gestionatr/input/messages/A3.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-from C2 import C2
-from Deadlines import DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .C2 import C2
+from .Deadlines import DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/B1.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-
-from C2 import C2, DatosSolicitud, Contacto
-from C1 import DatosAceptacion
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .C2 import C2, DatosSolicitud, Contacto
+from .C1 import DatosAceptacion
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/B70.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-from message_gas import MessageGas
+from __future__ import absolute_import, unicode_literals
+from .message_gas import MessageGas
 from gestionatr.utils import get_rec_attr
 from gestionatr.defs_gas import TIPUS_CONCEPTES
 from datetime import datetime

gestionatr/input/messages/C1.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-from message import Message
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .message import Message
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/C2.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-from C1 import C1, DatosSolicitud, Contrato, Cliente
-from Deadlines import DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .C1 import C1, DatosSolicitud, Contrato, Cliente
+from .Deadlines import DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/D1.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
 from gestionatr.input.messages import C1
 from gestionatr.utils import get_rec_attr
 

gestionatr/input/messages/Deadlines.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import, unicode_literals
 from collections import namedtuple
 from datetime import datetime, timedelta
 from workdays import workday

gestionatr/input/messages/F1.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
-from message import Message
+from __future__ import absolute_import, unicode_literals
+from .message import Message
 from gestionatr.input.messages.C2 import Direccion
 from gestionatr.defs import TARIFES_SEMPRE_MAX
 from datetime import datetime, date
 from gestionatr.utils import repartir_consums_entre_lectures
+import six
 
 # Magnituds d'OCSUM
 MAGNITUDS_OCSUM = {
@@ -1272,7 +1274,7 @@ def get_comptadors(self):
 
             di, df = aparell_multi.get_dates_inici_i_final()
             comptadors.append((di, df, aparell_multi))
-        return [a[2] for a in sorted(comptadors, lambda x,y: cmp(x[0], y[0]))]
+        return [a[2] for a in sorted(comptadors, key=lambda x: x[0])]
 
     def get_info_potencia(self):
         """Retorna els periodes de potència"""

gestionatr/input/messages/M1.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-
-from C2 import C2, DatosSolicitud
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .C2 import C2, DatosSolicitud
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
 
 

gestionatr/input/messages/Q1.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-from message import Message
+from __future__ import absolute_import, unicode_literals
+from .message import Message
 from gestionatr.utils import get_rec_attr
-from Deadlines import ProcessDeadline
+from .Deadlines import ProcessDeadline
 
 
 class Q1(Message, ProcessDeadline):

gestionatr/input/messages/R1.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
-from C2 import C2, Cliente, Contacto
-from C1 import DatosAceptacion
-from W1 import LecturaAportada
-from Deadlines import DeadLine, Workdays, Naturaldays
+from __future__ import absolute_import, unicode_literals
+from .C2 import C2, Cliente, Contacto
+from .C1 import DatosAceptacion
+from .W1 import LecturaAportada
+from .Deadlines import DeadLine, Workdays, Naturaldays
 from gestionatr.utils import get_rec_attr
 from gestionatr.defs import SUBTYPES_R101
 

gestionatr/input/messages/W1.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, unicode_literals
 from gestionatr.utils import get_rec_attr
-from C1 import C1
-from Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
+from .C1 import C1
+from .Deadlines import ProcessDeadline, DeadLine, Workdays, Naturaldays
 
 
 class W1(C1):

gestionatr/input/messages/__init__.py

@@ -1,25 +1,26 @@
 # -*- coding: utf-8 -*-
-from message import Message, except_f1
-from C1 import C1
-from C2 import C2
-from A1 import A1
-from A3 import A3
-from B1 import B1
-from M1 import M1
-from D1 import D1
-from W1 import W1
-from Q1 import Q1
-from R1 import R1
-from F1 import F1
-from message_gas import MessageGas
-from A1_41 import A1_41
-from B70 import B7031, B7032, B70
-from A1_02 import A1_02
-from A1_05 import A1_05
-from A1_44 import A1_44
-from A1_03 import A1_03
-from A1_04 import A1_04
-from A1_48 import A1_48
-from A1_46 import A1_46
-from A12_26 import A12_26
-from A19_45 import A19_45
+from __future__ import absolute_import
+from .message import Message, except_f1
+from .C1 import C1
+from .C2 import C2
+from .A1 import A1
+from .A3 import A3
+from .B1 import B1
+from .M1 import M1
+from .D1 import D1
+from .W1 import W1
+from .Q1 import Q1
+from .R1 import R1
+from .F1 import F1
+from .message_gas import MessageGas
+from .A1_41 import A1_41
+from .B70 import B7031, B7032, B70
+from .A1_02 import A1_02
+from .A1_05 import A1_05
+from .A1_44 import A1_44
+from .A1_03 import A1_03
+from .A1_04 import A1_04
+from .A1_48 import A1_48
+from .A1_46 import A1_46
+from .A12_26 import A12_26
+from .A19_45 import A19_45

gestionatr/input/messages/defs.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, unicode_literals
 # Definició de variables de llibreria
 # Taula 107 del document d'OCSUM:
 # OCSUM - E - Tablas de códigos 2012.05.23.doc