fix changes

Author: Tenebriso

hubblestack/daemon.py

@@ -637,12 +637,13 @@ def _setup_logging(parsed_args):
         if __opts__['daemonize']:
             __opts__['log_level'] = 'info'
     # Handle the explicit -vvv settings
-    if __opts__['verbose'] == 1:
-        __opts__['log_level'] = 'warning'
-    elif __opts__['verbose'] == 2:
-        __opts__['log_level'] = 'info'
-    elif __opts__['verbose'] >= 3:
-        __opts__['log_level'] = 'debug'
+    if __opts__['verbose']:
+        if __opts__['verbose'] == 1:
+            __opts__['log_level'] = 'warning'
+        elif __opts__['verbose'] == 2:
+            __opts__['log_level'] = 'info'
+        elif __opts__['verbose'] >= 3:
+            __opts__['log_level'] = 'debug'
     # Console logging is probably the same, but can be different
     console_logging_opts = {
         'log_level': __opts__.get('console_log_level', __opts__['log_level']),

hubblestack/status.py

@@ -254,7 +254,7 @@ def mark(self, timestamp=None):
                 timestamp = time.time()
                 self = self.get_bucket(timestamp)
             else:
-                if isinstance(timestamp, (str, unicode)):
+                if isinstance(timestamp, (str)):
                     timestamp = int(timestamp)
                 self = self.get_bucket(timestamp)
                 if timestamp < self.first_t: