[totalopenstation] 01/04: Imported Upstream version 0.3.2

[Matteo F. Vescovi]

This is an automated email from the git hooks/post-receive script.

mfv pushed a commit to branch master
in repository totalopenstation.

commit 0a5300e7a93380c6925464f8ad7c57bf9ee0762e
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Wed Aug 5 14:35:06 2015 +0200

    Imported Upstream version 0.3.2
---
 PKG-INFO                            |  2 +-
 scripts/totalopenstation-gui.py     |  2 +-
 totalopenstation.egg-info/PKG-INFO  |  2 +-
 totalopenstation/__init__.py        |  2 +-
 totalopenstation/models/__init__.py |  2 +-
 totalopenstation/utils/upref.py     | 13 +++++--------
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index c1f3189..b8c7c85 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: totalopenstation
-Version: 0.3.1
+Version: 0.3.2
 Summary: Download and export survey data from your total station
 Home-page: http://tops.iosa.it/
 Author: Stefano Costa
diff --git a/scripts/totalopenstation-gui.py b/scripts/totalopenstation-gui.py
index ac14999..73b3ebd 100755
--- a/scripts/totalopenstation-gui.py
+++ b/scripts/totalopenstation-gui.py
@@ -734,7 +734,7 @@ class Tops:
                     e = ErrorDialog(self.myParent, detail)
                 else:
                     st = DownloadDialog(self.myParent)
-                    sleeptime = self.option6_value.get()
+                    sleeptime = float(self.option6_value.get())
                     if st.result:
                         self.status.set(_("Waiting for data: please start transfer from your total station menu."))
                         while mc.inWaiting() == 0:
diff --git a/totalopenstation.egg-info/PKG-INFO b/totalopenstation.egg-info/PKG-INFO
index c1f3189..b8c7c85 100644
--- a/totalopenstation.egg-info/PKG-INFO
+++ b/totalopenstation.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: totalopenstation
-Version: 0.3.1
+Version: 0.3.2
 Summary: Download and export survey data from your total station
 Home-page: http://tops.iosa.it/
 Author: Stefano Costa
diff --git a/totalopenstation/__init__.py b/totalopenstation/__init__.py
index 10453df..1751d4b 100644
--- a/totalopenstation/__init__.py
+++ b/totalopenstation/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__  = '0.3.1'
+__version__  = '0.3.2'
diff --git a/totalopenstation/models/__init__.py b/totalopenstation/models/__init__.py
index 6f67226..7ae9270 100644
--- a/totalopenstation/models/__init__.py
+++ b/totalopenstation/models/__init__.py
@@ -35,7 +35,7 @@ class Connector(serial.Serial, Thread):
                 writeTimeout=None, dsrdtr=None):
 
         self.upref = UserPrefs()
-        sleeptime = self.upref.getvalue('sleeptime')
+        sleeptime = float(self.upref.getvalue('sleeptime'))
 
         Thread.__init__(self)
         self.dl_started = Event()
diff --git a/totalopenstation/utils/upref.py b/totalopenstation/utils/upref.py
index 2b11201..2ceaff1 100644
--- a/totalopenstation/utils/upref.py
+++ b/totalopenstation/utils/upref.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 # filename: upref.py
-# Copyright 2010,2013 Stefano Costa <steko at iosa.it>
+# Copyright 2015 Stefano Costa <steko at iosa.it>
 # Copyright 2010 Luca Bianconi <luxetluc at yahoo.it>
 #
 # This file is part of Total Open Station.
@@ -40,7 +40,7 @@ class UserPrefs(ConfigParser):
     OPTIONS = {
         'model': '',
         'port': '',
-        'sleeptime': 1.0,       # added in 0.3.1
+        'sleeptime': '1.0',       # added in 0.3.1
     }
 
     def __init__(self):
@@ -68,7 +68,7 @@ class UserPrefs(ConfigParser):
         logging.info('User preferences do not exist!')
         self.add_section('topsconfig')
         for k,v in self.OPTIONS.items():
-            self.set('topsconfig', k, v)
+            self.set('DEFAULT', k, v)
         logging.info('Created new user preferences file with default values')
 
     def write(self):
@@ -85,13 +85,10 @@ class UserPrefs(ConfigParser):
 
         return current_options
 
-    def getvalue(self, key):
+    def getvalue(self, option):
         ''' get specific config file value '''
 
-        try:
-            value = self.get('topsconfig', key)
-        except NoOptionError:
-            value = self.OPTIONS[key] # use default value
+        value = self.get('topsconfig', option)
         return value
 
     def setvalues(self, values):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/totalopenstation.git