Merged changes from main trunk

bin/weeutil/dbutil.py

@@ -13,7 +13,10 @@ from __future__ import with_statement
 
 import re
 
-from pysqlite2 import dbapi2 as sqlite3
+try:
+    from pysqlite2 import dbapi2 as sqlite3
+except ImportError:
+    from sqlite3 import dbapi2 as sqlite3
 
 # Regular expression that matches everything within the set
 # of parenthesis which marks the column definition:

bin/weewx/archive.py

@@ -12,7 +12,10 @@ from __future__ import with_statement
 import syslog
 import os.path
 import math
-from pysqlite2 import dbapi2 as sqlite3
+try:
+    from pysqlite2 import dbapi2 as sqlite3
+except ImportError:
+    from sqlite3 import dbapi2 as sqlite3
     
 import weewx.units
 import weeutil.weeutil

bin/weewx/restful.py

@@ -38,7 +38,7 @@ class REST(object):
     
     # The types to be retrieved from the arhive database:
     archive_types = ('dateTime', 'usUnits', 'barometer', 'outTemp', 'outHumidity', 
-                    'windSpeed', 'windDir', 'windGust', 'dewpoint', 'radiation')
+                    'windSpeed', 'windDir', 'windGust', 'dewpoint', 'radiation', 'UV')
     # A SQL statement to do the retrieval:
     sql_select = "SELECT " + ", ".join(archive_types) + " FROM archive WHERE dateTime=?"  
     
@@ -111,7 +111,9 @@ class Ambient(REST):
                 'windGust'    : 'windgustmph=%03.0f',
                 'dewpoint'    : 'dewptf=%.1f',
                 'rain'        : 'rainin=%.2f',
-                'dailyrain'   : 'dailyrainin=%.2f'}
+                'dailyrain'   : 'dailyrainin=%.2f',
+                'radiation'   : 'solarradiation=%.2f',
+                'UV'          : 'UV=%.2f'}
 
 
     def __init__(self, site, **kwargs):

bin/weewx/stats.py

@@ -39,7 +39,10 @@
 """
 
 from __future__ import with_statement
-from pysqlite2 import dbapi2 as sqlite3
+try:
+    from pysqlite2 import dbapi2 as sqlite3
+except ImportError:
+    from sqlite3 import dbapi2 as sqlite3
 import math
 import os.path
 import syslog

setup.py

@@ -362,7 +362,7 @@ setup(name='weewx',
                                                      'skins/Standard/weewx.css', 'skins/Standard/year.html.tmpl']), 
                      ('start_scripts/Debian',       ['start_scripts/Debian/weewx']),
                      ('start_scripts/SuSE',          ['start_scripts/SuSE/weewx'])],
-      requires    = ['configobj(>=4.5)', 'serial(>=2.3)', 'Cheetah(>=2.0)', 'pysqlite2(>=2.5)', 'PIL(>=1.1.6)'],
+      requires    = ['configobj(>=4.5)', 'serial(>=2.3)', 'Cheetah(>=2.0)', 'sqlite3(>=2.5)', 'PIL(>=1.1.6)'],
       cmdclass    = {"install_data" : My_install_data,
                      "install_lib"  : My_install_lib,
                      "sdist" :        My_sdist}