post review modifications dropping need for six in tests and restapi.py, minor cleanup in the context.py aisle

Author: klehman-rally

doc/source/interface.rst

@@ -131,7 +131,7 @@ Example use::
     print " ".join(['|%|' % opt for opt in [server, user, password, apikey, workspace, project]]
 
 
-    % python basic.py --config=current --rallyProject="Livestock Mgmt" --no-ping
+    % python basic.py --config=current --rallyProject="Livestock Mgmt" --ping=no
 
     |rally1.rallydev.com| |[email protected]| |*****| |*****| |General Products Umbrella| |Livestock Mgmt|
 

pyral/context.py

@@ -19,8 +19,6 @@
 import re  # we use compile, match
 from pprint import pprint
 
-#import six
-
 # intra-package imports
 from .rallyresp import RallyRESTResponse
 from .entity    import processSchemaInfo, getSchemaItem
@@ -285,20 +283,18 @@ def _loadSubscription(self):
         self.context.subs_name = subscription.Name
         return subscription
 
+
     def _setOperatingContext(self, project_name):
         """
             This is called after we've determined that there is access to what is now
-            in self._defaultWorkspace.  Query for projects in the self._defaultWorkspace.
+            in self._currentWorkspace.  Query for projects in the self._currentWorkspace.
             Set the self._defaultProject arbitrarily to the first Project.Name in the returned set,
             and then thereafter reset that to the project_name parameter value if a match for that
             exists in the returned set.  If the project_name parameter is non-None and there is NOT
             a match in the returned set raise an Exception stating that fact.
         """
-        #result = self.agent.get('Project', fetch="Name", workspace=self._defaultWorkspace)
         result = self.agent.get('Project', fetch="Name", workspace=self._currentWorkspace)
-##
-##        print(result.content)
-##
+
         if not result or result.resultCount == 0:
             problem = "No Projects found in the Workspace '%s'" % self._defaultWorkspace
             raise RallyRESTAPIError(problem)
@@ -406,9 +402,6 @@ def _getDefaults(self, user_response):
             self._currentWorkspace = self._defaultWorkspace[:]
             wkspace_ref = up['DefaultWorkspace']['_ref']
         else:
-            #self._currentWorkspace = self._defaultWorkspace.Name
-            #wkspace_ref            = self._defaultWorkspace._ref
-            #self._defaultWorkspace = self._defaultWorkspace.Name
             self._defaultWorkspace = None
             self._currentWorkspace = None
             wkspace_ref            = None
@@ -448,7 +441,6 @@ def _getSubscriptionWorkspaces(self, subscription, workspace=None, limit=0):
 ##        if not limit: print("Subscription %s has %d active Workspaces" % (subscription.Name, num_wksps))
 ##
         self._subs_workspaces  = subscription.Workspaces
-       #self._defaultWorkspace = subscription.Workspaces[0]
 ##
 ##        print("Subscription default Workspace: %s" % self._defaultWorkspace.Name)
 ##
@@ -718,7 +710,6 @@ def identifyContext(self, **kwargs):
                 augments.append("projectScopeDown=true")
 
         if not workspace and project:
-            #self.context = self.defaultContext
             self.context = self.operatingContext
 
         # check to see if the _current_project is actually in the _current_workspace

pyral/restapi.py

@@ -573,7 +573,6 @@ def getAllUsers(self, workspace=None):
                       # and other UserProfile attributes
                      ]
 
-        #users_resource = 'users?fetch=true&query=&pagesize=%s&start=1&workspace=%s' % (MAX_PAGESIZE, workspace_ref)
         users_resource = 'users?fetch=%s&query=&pagesize=%s&start=1&workspace=%s' % (",".join(user_attrs), MAX_PAGESIZE, workspace_ref)
         full_resource_url = '%s/%s' % (self.service_url, users_resource)
         response = self.session.get(full_resource_url, timeout=SERVICE_REQUEST_TIMEOUT)
@@ -704,7 +703,6 @@ def _itemQuery(self, entityName, oid, workspace=None, project=None):
             raise RallyRESTAPIError('%s %s' % (response.status_code, problem))
 
         response = RallyRESTResponse(self.session, context, '%s.x' % entityName, response, "full", 1)
-        #item = six.next(response)
         item = response.next()
         return item    # return back an instance representing the item
 
@@ -911,7 +909,6 @@ def get(self, entity, fetch=False, query=None, order=None, **kwargs):
         response = self._getRequestResponse(context, full_resource_url, limit)
 
         if kwargs and 'instance' in kwargs and kwargs['instance'] == True and response.resultCount == 1:
-            #return six.next(response)
             return response.next()
         return response
 
@@ -1032,7 +1029,6 @@ def post(self, entityName, itemData, workspace='current', project='current', **k
             if response.status_code != HTTP_REQUEST_SUCCESS_CODE or response.resultCount == 0:
                 raise RallyRESTAPIError('Target %s %s could not be located' % (entityName, formattedID))
 
-            #target = six.next(response)
             target = response.next()
             oid = target.ObjectID
             itemData['ObjectID'] = oid
@@ -1087,7 +1083,6 @@ def delete(self, entityName, itemIdent, workspace='current', project='current',
             if response.status_code != HTTP_REQUEST_SUCCESS_CODE:
                 raise RallyRESTAPIError('Target %s %s could not be located' % (entityName, itemIdent))
 
-            #target = six.next(response)
             target = response.next()
             objectID = target.ObjectID
 ##
@@ -1458,7 +1453,6 @@ def addAttachment(self, artifact, filename, mime_type='text/plain'):
 
         response = self.get('Attachment', fetch=True, query='Name = "%s"' % attachment_file_name)
         if response.resultCount:
-            #attachment = six.next(response)
             attachment = response.next()
             already_attached = [att for att in current_attachments if att.oid == attachment.oid]
             if already_attached:
@@ -1560,7 +1554,6 @@ def getAttachment(self, artifact, filename):
         response = RallyRESTResponse(self.session, context, "AttachmentContent.x", resp, "full", 1)
         if response.errors or response.resultCount != 1:
             return None
-        #att_content = six.next(response)
         att_content = response.next()
         att.Content = base64.decodestring(att_content.Content)  # maybe further txfm to Unicode ?
         return att
@@ -1604,9 +1597,6 @@ def deleteAttachment(self, artifact, filename):
 
         # get the target Attachment and the associated AttachmentContent item
         attachment = hits.pop(0)
-##
-##        print(attachment.details())
-##
         if attachment.Content and attachment.Content.oid:
             success = self.delete('AttachmentContent', attachment.Content.oid, project=None)
             if not success:
@@ -1651,7 +1641,6 @@ def _realizeArtifact(self, artifact):
             art_type = self.ARTIFACT_TYPE[prefix]
             response = self.get(art_type, fetch=True, query='FormattedID = %s' % artifact)
             if response.resultCount == 1:
-                #artifact = six.next(response)
                 artifact = response.next()
             else:
                 art_type = False
@@ -1730,7 +1719,6 @@ def _postRankRequest(self, target_artifact, resource, update_item):
         workspace_ref = self.contextHelper.currentWorkspaceRef()
         auth_token = self.obtainSecurityToken()
         full_resource_url = "%s/%s&workspace=%s&key=%s" % (self.service_url, resource, workspace_ref, auth_token)
-        #print("rank%s full_resource_url: %s" % (direction, full_resource_url))
         payload = json.dumps(update_item)
         response = self.session.post(full_resource_url, data=payload, headers=RALLY_REST_HEADERS)
         context = self.contextHelper.currentContext()

rallyfire.py

@@ -10,7 +10,6 @@
 import sys
 
 from pyral import Rally, rallyWorkset
-from pyral import context
 
 #################################################################################################
 

test/test_attachments.py

@@ -4,8 +4,6 @@
 import types
 import py
 
-import six
-
 import pyral
 from pyral import Rally
 
@@ -62,7 +60,7 @@ def test_add_attachment():
     response = rally.get("UserStory", fetch="FormattedID,Name,Attachments", 
                                    query='FormattedID = "%s"' % candidate_story)
   ##print(response.resultCount)
-    story = six.next(response)
+    story = response.next()
     assert len(story.Attachments) == 0
 
     attachment_name = "Addendum.txt"
@@ -74,7 +72,7 @@ def test_add_attachment():
 
     response = rally.get("UserStory", fetch="FormattedID,Name,Attachments", 
                                    query='FormattedID = "%s"' % candidate_story)
-    story = six.next(response)
+    story = response.next()
     assert len(story.Attachments) == 1
 
 
@@ -86,7 +84,7 @@ def test_get_attachment():
     target = 'FormattedID = "%s"' % candidate_story
     response = rally.get("UserStory", fetch=True, query=target, project=None)
     assert response.resultCount == 1
-    story = six.next(response)
+    story = response.next()
 ##
     assert True == True
     return True
@@ -155,7 +153,7 @@ def test_detach_attachment():
 
     response = rally.get("UserStory", fetch=True, query=target, project=None)
     assert response.resultCount == 1
-    story = six.next(response)
+    story = response.next()
     assert len(story.Attachments) == 1
     attachment = story.Attachments[0]
     expected_attachment_name = "Addendum.txt"

test/test_convenience.py

@@ -3,7 +3,6 @@
 import sys, os
 import types
 import pprint
-import six
 
 from pyral import Rally
 
@@ -57,7 +56,6 @@ def test_getProject():
     assert response.warnings == []
 
     assert response.resultCount > 0
-    #proj_rec = six.next(response)
     proj_rec = response.next()
     #print proj_rec._ref
     #print proj_rec.ref

test/test_field_access.py

@@ -2,7 +2,6 @@
 
 import sys, os
 import py
-import six
 
 from pyral import Rally
 import pyral
@@ -23,7 +22,7 @@ def test_story_fields():
     rally = Rally(server=TRIAL, user=TRIAL_USER, password=TRIAL_PSWD)
     response = rally.get('Story', fetch=True, query=['NumberofCases = 9', 'AffectedCustomers = "abc, xyz"'])
     assert response.status_code == 200
-    story = six.next(response)
+    story = response.next()
 
     assert story.NumberofCases == 9
     assert story.AffectedCustomers == 'abc, xyz'
@@ -40,7 +39,7 @@ def test_defect_fields():
     cust_field_criteria = {"BugzillaID" : 7224, "JiraKey" : "SLO-109", "QCDefectID" : 5724}
     response = rally.get('Defect', fetch=True, query=cust_field_criteria)
     assert response.status_code == 200
-    defect = six.next(response)
+    defect = response.next()
     assert defect.NumberofCases == 4
     assert 'def, jkl, qrs, uvw' in defect.AffectedCustomers
 

test/test_inflation.py

@@ -171,12 +171,9 @@ def test_named_non_default_workspace_named_valid_project():
         Return status should be OK, the Rally instance's RallyContextHelper
         _inflated value should be 'minimal'
     """
-    #workspace = 'JIRA Manual Testing'
-    #project   = 'Another Sample Project'
-    workspace = "Kip's Playground"
-    alt_project   = 'Modus Operandi'
-    rally = Rally(server=TRIAL, user=TRIAL_USER, password=TRIAL_PSWD,
-                  workspace=workspace)
+    workspace   = "Kip's Playground"
+    alt_project = 'Modus Operandi'
+    rally = Rally(server=TRIAL, user=TRIAL_USER, password=TRIAL_PSWD, workspace=workspace, warn=False)
     response = rally.get('Project')
     assert response != None
     assert response.status_code == 200

test/test_query.py

@@ -5,8 +5,6 @@
 import urllib
 import py
 
-import six
-
 try:
     from urllib import unquote
 except:
@@ -95,7 +93,7 @@ def test_good_and_bad_fields_query():
     """
     rally = Rally(server=TRIAL, user=TRIAL_USER, password=TRIAL_PSWD)
     response = rally.get('Project', fetch="Owner,State,Fabulote,GammaRays", limit=10)
-    project = six.next(response)
+    project = response.next()
     name  = None
     state = None
     fabulote  = None
@@ -168,8 +166,8 @@ def test_defects_revision_history():
     rally = Rally(server=TRIAL, user=TRIAL_USER, password=TRIAL_PSWD)
     response = rally.get('Defect', fetch=True,  limit=10)
 
-    defect1 = six.next(response)
-    defect2 = six.next(response)
+    defect1 = response.next()
+    defect2 = response.next()
     assert defect1.oid != defect2.oid
 
     d1_revs = defect1.RevisionHistory.Revisions
@@ -448,7 +446,7 @@ def test_query_with_matched_parens_in_condition_value():
     assert response.errors   == []
     assert response.warnings == []
     assert response.resultCount >= 1
-    release = six.next(response)
+    release = response.next()
     assert release.Name == '8.5 (Blah and Stuff)'