Merge pull request #1374 from jberry-suse/request_age-followup

osclib/core: request_age() return delta and handle Request object.

devel-project.py

@@ -109,7 +109,7 @@ def requests(args):
                                     withfullhistory=True)
         for request in requests:
             action = request.actions[0]
-            age = request_age(request)
+            age = request_age(request).days
             if age < args.min_age:
                 continue
 
@@ -134,7 +134,7 @@ def reviews(args):
             if action.type != 'submit':
                 continue
 
-            age = request_age(request)
+            age = request_age(request).days
             if age < args.min_age:
                 continue
 

osclib/core.py

@@ -10,6 +10,7 @@ from osc.core import get_dependson
 from osc.core import http_GET
 from osc.core import makeurl
 from osc.core import owner
+from osc.core import Request
 from osc.core import show_package_meta
 from osc.core import show_project_meta
 from osclib.memoize import memoize
@@ -166,6 +167,9 @@ def devel_project_fallback(apiurl, target_project, target_package):
     return project, package
 
 def request_age(request):
-    created = date_parse(request.find('history').get('when'))
-    delta = datetime.utcnow() - created
-    return delta.total_seconds()
+    if isinstance(request, Request):
+        created = request.statehistory[0].when
+    else:
+        created = request.find('history').get('when')
+    created = date_parse(created)
+    return datetime.utcnow() - created

osclib/request_splitter.py

@@ -107,7 +107,7 @@ class RequestSplitter(object):
 
         history = request.find('history')
         if history is not None:
-            age = request_age(request)
+            age = request_age(request).total_seconds()
             request.set('aged', str(age >= self.request_age_threshold))
 
         request_type = request.find('./action').get('type')

status.py

@@ -44,7 +44,7 @@ def check(apiurl, entity, entity_type='group', comment=False, bot=None,
 
         requests = search(apiurl, queries, request=xpath)['request']
         for request in requests:
-            age = request_age(request)
+            age = request_age(request).total_seconds()
             request_debug(request, age, threshold)
 
             if age <= threshold:
@@ -77,7 +77,7 @@ def check(apiurl, entity, entity_type='group', comment=False, bot=None,
         elif comment:
             kwargs['request_id'] = request.get('id')
 
-        age = request_age(request)
+        age = request_age(request).total_seconds()
         request_debug(request, age, threshold)
         comment_age = check_comment(apiurl, bot, **kwargs)
         if comment_age: