Rev 6523: rename some variables for clarity. in http://bazaar.launchpad.net/~jameinel/bzr/2.5-remote-wt-tests-1046697

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.5-remote-wt-tests-1046697

------------------------------------------------------------
revno: 6523
revision-id: john at arbash-meinel.com-20120907062843-papmaad6wk5i8izn
parent: john at arbash-meinel.com-20120906120527-xb0q9ayrsra0ornx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.5-remote-wt-tests-1046697
timestamp: Fri 2012-09-07 10:28:43 +0400
message:
  rename some variables for clarity.
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2012-09-06 11:48:28 +0000
+++ b/bzrlib/workingtree_4.py	2012-09-07 06:28:43 +0000
@@ -1888,19 +1888,18 @@
         return self.inventory[file_id].text_size
 
     def get_file_text(self, file_id, path=None):
-        full_content = None
-        for _, content in self.iter_files_bytes([(file_id, None)]):
-            if full_content is not None:
+        content = None
+        for _, content_iter in self.iter_files_bytes([(file_id, None)]):
+            if content is not None:
                 raise AssertionError('iter_files_bytes returned'
                     ' too many entries')
             # For each entry returned by iter_files_bytes, we must consume the
-            # content before we step the iterator.
-            full_content = ''.join(content)
-            del content
-        if full_content is None:
+            # content_iter before we step the files iterator.
+            content = ''.join(content_iter)
+        if content is None:
             raise AssertionError('iter_files_bytes did not return'
                 ' the requested data')
-        return full_content
+        return content
 
     def get_reference_revision(self, file_id, path=None):
         return self.inventory[file_id].reference_revision