#691 Move error handling up.
Merged 6 years ago by ignatenkobrain. Opened 6 years ago by ralph.

file modified
+5 -5
@@ -187,11 +187,6 @@ 

      #query['ordering'] = '-variant_release'

      retval = session['unreleasedvariants/'](page_size=1, **query)

  

-     # Jump to last page to latest module release.

-     if retval['count'] != 1:

-         query['page'] = retval['count']

-         retval = session['unreleasedvariants/'](page_size=1, **query)

- 

      # Error handling

      if not retval or len(retval["results"]) == 0:

          if strict:
@@ -199,6 +194,11 @@ 

          else:

              return None

  

+     # Jump to last page to latest module release.

+     if retval['count'] != 1:

+         query['page'] = retval['count']

+         retval = session['unreleasedvariants/'](page_size=1, **query)

+ 

      results = retval["results"]

      assert len(results) <= 1, pprint.pformat(retval)

      return results[0]

We need to check for the error here before we make a second request
for the "last page". If we don't, we can end up submitting a query
asking for "page 0" which fails without a helpful message.

Pull-Request has been merged by ignatenkobrain

6 years ago