Port to Python3

Signed-off-by: David Gibson <[email protected]>

Author: dgibson

.travis.yml

@@ -3,10 +3,10 @@ language: python
 sudo: false
 
 python:
-  - "2.7"
+  - "3.6"
 
 install:
-  - "pip install -r requirements.txt"
+  - "pip3 install -r requirements.txt"
 
 script:
-  - make check
+  - make check NOSE=nosetests

Makefile

@@ -1,6 +1,6 @@
-NOSE = nosetests
-PEP8 = pep8
-FLAKE8 = flake8-2
+NOSE = nosetests-3
+PEP8 = python3-pep8
+FLAKE8 = python3-flake8
 
 NOSEFLAGS = --with-coverage --cover-package=smadata2
 

requirements.txt

@@ -1,2 +1,3 @@
 python-dateutil
 coverage
+nose

sma2-bad-date-check

@@ -1,6 +1,4 @@
-#! /usr/bin/env python
-
-from __future__ import print_function
+#! /usr/bin/python
 
 import sys
 import datetime

sma2-correct-date

@@ -1,6 +1,4 @@
-#! /usr/bin/env python
-
-from __future__ import print_function
+#! /usr/bin/python3
 
 import sys
 import time

sma2-explore

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # sma2-explore - Interactive tool for analyzing SMAData2 protocol
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -196,7 +196,7 @@ class SMAData2CLI(Connection):
         while True:
             sys.stdout.write("SMA2 %s >> " % self.remote_addr)
             try:
-                line = raw_input().split()
+                line = input().split()
             except EOFError:
                 return
 

sma2-push-daily-to-pvoutput

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # sma2-download - Download historic generation info from SMA inverters
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,8 +17,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 import datetime
 import time
 

sma2-upload-to-pvoutputorg

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # sma2-upload-to-pvoutputorg - Upload generation history to pvoutput.org
 # Copyright (C) 2014 Peter Barker <[email protected]>
@@ -17,8 +17,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 import argparse
 import datetime
 import sys

sma2mon

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 
 import smadata2.sma2mon
 

smadata2/__init__.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.__init__ - Python code for the SMAData2 protocol
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -16,7 +16,3 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Nothing to see here
-
-from __future__ import print_function

smadata2/check.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.check - Testing utilities
 # Copyright (C) 2015 David Gibson <[email protected]>
@@ -17,8 +17,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 
 def generate_linear(start, dawn, dusk, end, startyield, rate):
     results = []

smadata2/config.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.config - Configuration file handling for SMAData2 code
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,19 +17,16 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 import sys
 import os
 import dateutil.parser
 import dateutil.tz
 import json
 
-import inverter
-import inverter.smabluetooth
-import pvoutputorg
-import datetimeutil
-import db
+from .inverter import smabluetooth
+from . import pvoutputorg
+from . import datetimeutil
+from . import db
 
 DEFAULT_CONFIG_FILE = os.path.expanduser("~/.smadata2.json")
 
@@ -45,7 +42,7 @@ def __init__(self, invjson, defname):
             self.starttime = None
 
     def connect(self):
-        return inverter.smabluetooth.Connection(self.bdaddr)
+        return smabluetooth.Connection(self.bdaddr)
 
     def connect_and_logon(self):
         conn = self.connect()

smadata2/datetimeutil.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.datetimeutil - Date and time helper functions
 # Copyright (C) 2014, 2015 David Gibson <[email protected]>
@@ -17,8 +17,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 import dateutil.parser
 import dateutil.tz
 import datetime

smadata2/db/__init__.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.db - Database for logging data from SMA inverters
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,7 +17,5 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 from .base import WrongSchema
 from .sqlite import SQLiteDatabase

smadata2/db/base.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.db.base - Abstract database interface
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,8 +17,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 import abc
 
 
@@ -33,9 +31,7 @@ class WrongSchema(Error):
     pass
 
 
-class BaseDatabase(object):
-    __metaclass__ = abc.ABCMeta
-
+class BaseDatabase(object, metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def add_historic(self, serial, timestamp, total_yield):
         raise NotImplementedError()

smadata2/db/mock.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.db - Database for logging data from SMA inverters
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,9 +17,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
-from base import BaseDatabase
+from .base import BaseDatabase
 
 
 class MockDatabase(BaseDatabase):

smadata2/db/sqlite.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.db - Database for logging data from SMA inverters
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,15 +17,13 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 import shutil
 import re
 import sqlite3
 import time
 import datetime
 
-from base import BaseDatabase, WrongSchema
+from .base import BaseDatabase, WrongSchema
 
 
 all = ['SQLiteDatabase']
@@ -128,7 +126,7 @@ def midnights(self, inverters):
         ORDER BY timestamp ASC"""
         c.execute(template, (serials,))
         r = c.fetchall()
-        r = map(lambda x: datetime.datetime.utcfromtimestamp(x[0]), r)
+        r = [datetime.datetime.utcfromtimestamp(x[0]) for x in r]
         return r
 
     def get_datapoint_totals_for_day(self, inverters, start_datetime):

smadata2/db/tests.py

@@ -1,6 +1,4 @@
-#! /usr/bin/env python
-
-from __future__ import print_function
+#! /usr/bin/python3
 
 import os
 import os.path
@@ -51,7 +49,7 @@ def prepare_sqlite(self):
         self.prepopulate()
 
         if os.path.exists(self.dbname):
-            self.original = open(self.dbname).read()
+            self.original = open(self.dbname, 'rb').read()
         else:
             self.original = None
 
@@ -149,7 +147,7 @@ def test_basic(self):
             assert_equals(y1, i)
             assert_equals(y2, 2*i)
 
-        val = (self.dusk - self.dawn - 1) / 300
+        val = (self.dusk - self.dawn - 1) // 300
         for ts in range(self.dusk, 24*3600, 300):
             y1 = self.db.get_one_historic(self.serial1, ts)
             y2 = self.db.get_one_historic(self.serial2, ts)
@@ -160,7 +158,7 @@ def test_basic(self):
     def test_aggregate_one(self):
         val = self.db.get_aggregate_one_historic(self.dusk,
                                                  (self.serial1, self.serial2))
-        assert_equals(val, 3*((self.dusk - self.dawn - 2) / 300))
+        assert_equals(val, 3*((self.dusk - self.dawn - 2) // 300))
 
     def check_aggregate_range(self, from_, to_):
         results = self.db.get_aggregate_historic(from_, to_,
@@ -176,9 +174,9 @@ def check_aggregate_range(self, from_, to_):
             if ts < self.dawn:
                 assert_equals(y, 0)
             elif ts < self.dusk:
-                assert_equals(y, 3*((ts - self.dawn) / 300))
+                assert_equals(y, 3*((ts - self.dawn) // 300))
             else:
-                assert_equals(y, 3*((self.dusk - self.dawn - 1) / 300))
+                assert_equals(y, 3*((self.dusk - self.dawn - 1) // 300))
 
     def test_aggregate(self):
         yield self.check_aggregate_range, 0, 24*3600
@@ -203,7 +201,7 @@ class UpdateSQLiteChecker(SQLiteDBChecker):
 
     def test_backup(self):
         assert os.path.exists(self.bakname)
-        backup = open(self.bakname).read()
+        backup = open(self.bakname, 'rb').read()
         assert_equals(self.original, backup)
 
     def test_preserved(self):

smadata2/download.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.download - Routines to download from an inverter to database
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,7 +17,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
 import time
 
 

smadata2/inverter/__init__.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.inverter - Inverter connections
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -16,5 +16,3 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from __future__ import print_function

smadata2/inverter/base.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.db.base - Abstract inverter interface
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,8 +17,6 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
 import abc
 
 
@@ -29,9 +27,7 @@ class Error(Exception):
     pass
 
 
-class InverterConnection(object):
-    __metaclass__ = abc.ABCMeta
-
+class InverterConnection(object, metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def total_yield(self):
         raise NotImplementedError()

smadata2/inverter/mock.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 #
 # smadata2.inverter.mock - Mock inverter connections
 # Copyright (C) 2014 David Gibson <[email protected]>
@@ -17,9 +17,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-from __future__ import print_function
-
-from base import InverterConnection
+from .base import InverterConnection
 
 
 class MockInverterZero(InverterConnection):