Revert "make as_list work for all queries"

This reverts commit 8e787612fa77dc945a4c1327e9faa6eee10c48f2.

This change broke the basic generator usage (Fixes #534)

1 files changed, 13 insertions, 7 deletions

diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 4a79551..8e62188 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -537,7 +537,8 @@ class Gitlab(object):
 
         Returns:
             list: A list of the objects returned by the server. If `as_list` is
-            False then a GitlabList object (generator) is returned
+            False and no pagination-related arguments (`page`, `per_page`,
+            `all`) are defined then a GitlabList object (generator) is returned
             instead. This object will make API calls when needed to fetch the
             next items from the server.
 
@@ -547,16 +548,21 @@ class Gitlab(object):
         """
 
         # In case we want to change the default behavior at some point
-        as_list = as_list is None or as_list
+        as_list = True if as_list is None else as_list
 
         get_all = kwargs.get('all', False)
         url = self._build_url(path)
 
-        glist = GitlabList(self, url, query_data,
-                           get_next='page' not in kwargs and get_all, **kwargs)
-        if as_list:
-            glist = list(glist)
-        return glist
+        if get_all is True:
+            return list(GitlabList(self, url, query_data, **kwargs))
+
+        if 'page' in kwargs or as_list is True:
+            # pagination requested, we return a list
+            return list(GitlabList(self, url, query_data, get_next=False,
+                                   **kwargs))
+
+        # No pagination, generator requested
+        return GitlabList(self, url, query_data, **kwargs)
 
     def http_post(self, path, query_data={}, post_data={}, files=None,
                   **kwargs):