Made views() a property, added safety in case view doesn't have subviews

diff --git a/jenkinsapi/jenkins.py b/jenkinsapi/jenkins.py
index 08d917b..8c2b2aa 100644 (file)
--- a/jenkinsapi/jenkins.py
+++ b/jenkinsapi/jenkins.py
@@ -206,6 +206,7 @@ class Jenkins(JenkinsBase):
     def __str__(self):
         return "Jenkins server at %s" % self.baseurl
 
+    @property
     def views(self):
         return Views(self)
 

diff --git a/jenkinsapi/view.py b/jenkinsapi/view.py
index 2df75d0..4d96074 100644 (file)
--- a/jenkinsapi/view.py
+++ b/jenkinsapi/view.py
@@ -153,5 +153,6 @@ class View(JenkinsBase):
     def get_nested_view_dict(self):
         return dict(self._get_nested_views())
 
+    @property
     def views(self):
         return self.get_jenkins_obj().get_jenkins_obj_from_url(self.baseurl).views()

diff --git a/jenkinsapi/views.py b/jenkinsapi/views.py
index db65d03..b99942e 100644 (file)
--- a/jenkinsapi/views.py
+++ b/jenkinsapi/views.py
@@ -43,7 +43,7 @@ class Views(object):
                 raise TypeError('Job %s does not exist in Jenkins')
 
     def __getitem__(self, view_name):
-        for row in self.jenkins._data['views']:
+        for row in self.jenkins._data.get('views', []):
             if row['name'] == view_name:
                 return View(
                     row['url'],
@@ -57,7 +57,7 @@ class Views(object):
         Get the names & objects for all views
         """
         self.jenkins.poll()
-        for row in self.jenkins._data['views']:
+        for row in self.jenkins._data.get('views', []):
             name = row['name']
             url = row['url']
 

diff --git a/jenkinsapi_tests/unittests/test_views.py b/jenkinsapi_tests/unittests/test_views.py
index c2e0528..f7a26d3 100644 (file)
--- a/jenkinsapi_tests/unittests/test_views.py
+++ b/jenkinsapi_tests/unittests/test_views.py
@@ -25,7 +25,7 @@ class TestViews(unittest.TestCase):
                     username='foouser', password='foopassword',
                     requester=mock_requester)
 
-        new_view = J.views().create('NewView')
+        new_view = J.views.create('NewView')
         self.assertTrue(isinstance(new_view, View))
         self.assertEquals(new_view.baseurl,
                 'http://localhost:8080/views/NewView')
@@ -55,7 +55,7 @@ class TestViews(unittest.TestCase):
                     username='foouser',
                     password='foopassword')
 
-            new_view = J.views().create('NewView')
+            new_view = J.views.create('NewView')
 
             self.assertIsInstance(new_view, View)