Convert relative imports to absolute

This improves compatibility with Python 2.5 and is generally thought to
be better style.

Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>

src/pywws/DataStore.py

@@ -1,6 +1,6 @@
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-15  pywws contributors
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -78,7 +78,7 @@
 from threading import Lock
 import time
 
-from .constants import DAY
+from pywws.constants import DAY
 
 def safestrptime(date_string, format=None):
     # time.strptime is time consuming (because it's so flexible?) so don't use

src/pywws/EWtoPy.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -65,8 +65,8 @@
 import os
 import sys
 
-from . import DataStore
-from . import TimeZone
+from pywws import DataStore
+from pywws import TimeZone
 
 def main(argv=None):
     if argv is None:

src/pywws/Forecast.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -41,10 +41,10 @@
 import getopt
 import sys
 
-from . import DataStore
-from . import Localisation
-from .TimeZone import Local, utc
-from . import ZambrettiCore
+from pywws import DataStore
+from pywws import Localisation
+from pywws.TimeZone import Local, utc
+from pywws import ZambrettiCore
 
 def ZambrettiCode(params, hourly_data):
     north = eval(params.get('Zambretti', 'north', 'True'))

src/pywws/Hourly.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -50,12 +50,12 @@
 import os
 import sys
 
-from . import DataStore
-from . import Localisation
-from .LogData import DataLogger
-from .Logger import ApplicationLogger
-from . import Process
-from . import Tasks
+from pywws import DataStore
+from pywws import Localisation
+from pywws.LogData import DataLogger
+from pywws.Logger import ApplicationLogger
+from pywws import Process
+from pywws import Tasks
 
 def Hourly(data_dir):
     # get file locations

src/pywws/LiveLog.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -48,12 +48,12 @@
 import sys
 import time
 
-from . import DataStore
-from . import Localisation
-from .LogData import DataLogger
-from .Logger import ApplicationLogger
-from . import Process
-from . import Tasks
+from pywws import DataStore
+from pywws import Localisation
+from pywws.LogData import DataLogger
+from pywws.Logger import ApplicationLogger
+from pywws import Process
+from pywws import Tasks
 
 def LiveLog(data_dir):
     logger = logging.getLogger('pywws.LiveLog')

src/pywws/LogData.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-15 pywws contributors
+# Copyright (C) 2008-16 pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -73,10 +73,10 @@
 import sys
 import time
 
-from .constants import SECOND, HOUR
-from . import DataStore
-from .Logger import ApplicationLogger
-from .WeatherStation import weather_station
+from pywws.constants import SECOND, HOUR
+from pywws import DataStore
+from pywws.Logger import ApplicationLogger
+from pywws.WeatherStation import weather_station
 
 class DataLogger(object):
     def __init__(self, params, status, raw_data):

src/pywws/Logger.py

@@ -28,7 +28,7 @@
 import logging.handlers
 import sys
 
-from . import __version__, _release, _commit
+from pywws import __version__, _release, _commit
 
 def ApplicationLogger(verbose, logfile=None):
     logger = logging.getLogger('')

src/pywws/Plot.py

@@ -515,12 +515,12 @@
 
 import pytz
 
-from .constants import HOUR
-from .conversions import *
-from . import DataStore
-from . import Localisation
-from .Logger import ApplicationLogger
-from .TimeZone import Local, utc
+from pywws.constants import HOUR
+from pywws.conversions import *
+from pywws import DataStore
+from pywws import Localisation
+from pywws.Logger import ApplicationLogger
+from pywws.TimeZone import Local, utc
 
 class GraphNode(object):
     def __init__(self, node):

src/pywws/Process.py

@@ -3,7 +3,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-15  pywws contributors
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -83,11 +83,11 @@
 import os
 import sys
 
-from .calib import Calib
-from .constants import HOUR, DAY, SECOND
-from . import DataStore
-from .Logger import ApplicationLogger
-from .TimeZone import STDOFFSET
+from pywws.calib import Calib
+from pywws.constants import HOUR, DAY, SECOND
+from pywws import DataStore
+from pywws.Logger import ApplicationLogger
+from pywws.TimeZone import STDOFFSET
 
 TIME_ERR = timedelta(seconds=45)
 MINUTEx5 = timedelta(minutes=5)

src/pywws/Reprocess.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -53,9 +53,9 @@
 import os
 import sys
 
-from . import DataStore
-from .Logger import ApplicationLogger
-from . import Process
+from pywws import DataStore
+from pywws.Logger import ApplicationLogger
+from pywws import Process
 
 def Reprocess(data_dir, update):
     logger = logging.getLogger('pywws.Reprocess')

src/pywws/SetWeatherStation.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -48,8 +48,8 @@
 import sys
 import time
 
-from .Logger import ApplicationLogger
-from . import WeatherStation
+from pywws.Logger import ApplicationLogger
+from pywws import WeatherStation
 
 def bcd_encode(value):
     hi = value // 10

src/pywws/Tasks.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-15  pywws contributors
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -29,14 +29,14 @@
 import shutil
 import threading
 
-from .calib import Calib
-from . import Plot
-from . import Template
-from .TimeZone import STDOFFSET, Local
-from .toservice import ToService
-from . import Upload
-from . import WindRose
-from . import YoWindow
+from pywws.calib import Calib
+from pywws import Plot
+from pywws import Template
+from pywws.TimeZone import STDOFFSET, Local
+from pywws.toservice import ToService
+from pywws import Upload
+from pywws import WindRose
+from pywws import YoWindow
 
 class RegularTasks(object):
     def __init__(self, params, status,
@@ -384,7 +384,7 @@ def _do_service(self, name, live_data):
 
     def do_twitter(self, template, data=None):
         if not self.twitter:
-            from . import ToTwitter
+            from pywws import ToTwitter
             self.twitter = ToTwitter.ToTwitter(self.params)
         self.logger.info("Templating %s", template)
         input_file = os.path.join(self.template_dir, template)

src/pywws/Template.py

@@ -305,14 +305,14 @@
 import shlex
 import sys
 
-from .constants import HOUR, SECOND, DAY
-from . import conversions
-from .conversions import *
-from . import DataStore
-from .Forecast import Zambretti, ZambrettiCode
-from . import Localisation
-from .Logger import ApplicationLogger
-from .TimeZone import Local, utc
+from pywws.constants import HOUR, SECOND, DAY
+from pywws import conversions
+from pywws.conversions import *
+from pywws import DataStore
+from pywws.Forecast import Zambretti, ZambrettiCode
+from pywws import Localisation
+from pywws.Logger import ApplicationLogger
+from pywws.TimeZone import Local, utc
 
 class Template(object):
     def __init__(self, params, status,

src/pywws/TestWeatherStation.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -56,8 +56,8 @@
 import sys
 import time
 
-from .Logger import ApplicationLogger
-from . import WeatherStation
+from pywws.Logger import ApplicationLogger
+from pywws import WeatherStation
 
 def raw_dump(pos, data):
     print "%04x" % pos,

src/pywws/ToTwitter.py

@@ -60,10 +60,10 @@
         # raise exception on the preferred library
         raise ex
 
-from .constants import Twitter as pct
-from . import DataStore
-from . import Localisation
-from .Logger import ApplicationLogger
+from pywws.constants import Twitter as pct
+from pywws import DataStore
+from pywws import Localisation
+from pywws.Logger import ApplicationLogger
 
 class TweepyHandler(object):
     def __init__(self, key, secret, latitude, longitude):

src/pywws/TwitterAuth.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -53,8 +53,8 @@
 import urlparse
 import webbrowser
 
-from .constants import Twitter
-from . import DataStore
+from pywws.constants import Twitter
+from pywws import DataStore
 
 def TwitterAuth(params):
     consumer = oauth.Consumer(Twitter.consumer_key, Twitter.consumer_secret)

src/pywws/USBQualityTest.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -68,8 +68,8 @@
 import getopt
 import sys
 
-from .Logger import ApplicationLogger
-from . import WeatherStation
+from pywws.Logger import ApplicationLogger
+from pywws import WeatherStation
 
 def main(argv=None):
     if argv is None:

src/pywws/Upload.py

@@ -2,7 +2,7 @@
 
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-14  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-16  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -84,8 +84,8 @@
 import shutil
 import sys
 
-from . import DataStore
-from .Logger import ApplicationLogger
+from pywws import DataStore
+from pywws.Logger import ApplicationLogger
 
 class _ftp(object):
     def __init__(self, logger, site, user, password, directory, port):