kallithea Changeset - e8650fbc4d4e

Changeset - e8650fbc4d4e

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-07-06 00:01:09
marcin@python-works.com

Moved BytesIO into compat because of py25 compatibility issue

2 files changed with 12 insertions and 2 deletions:

rhodecode/lib/compat.py

rhodecode/lib/diffs.py

0 comments (0 inline, 0 general)

rhodecode/lib/compat.py

➞

Show inline comments

@@ @@ -391,6 +391,16 @@ except ImportError: @@
         pools = map(tuple, args) * kwds.get('repeat', 1)
         result = [[]]
         for pool in pools:
             result = [x + [y] for x in result for y in pool]
         for prod in result:
             yield tuple(prod)
 #==============================================================================
 # BytesIO
 #==============================================================================
 try:
     from io import BytesIO
 except ImportError:
     from cStringIO import StringIO as BytesIO

rhodecode/lib/diffs.py

➞

Show inline comments

@@ @@ -23,25 +23,25 @@ @@
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import re
 import io
 import difflib
 import markupsafe
 from itertools import tee, imap
 from mercurial import patch
 from mercurial.mdiff import diffopts
 from mercurial.bundlerepo import bundlerepository
 from mercurial import localrepo
 from pylons.i18n.translation import _
 from rhodecode.lib.compat import BytesIO
 from rhodecode.lib.vcs.exceptions import VCSError
 from rhodecode.lib.vcs.nodes import FileNode, SubModuleNode
 from rhodecode.lib.helpers import escape
 from rhodecode.lib.utils import EmptyChangeset, make_ui
@@ @@ -600,13 +600,13 @@ def differ(org_repo, org_ref, other_repo @@
             for k, _ in other_repo.ui.configitems('hooks'):
                 other_repo.ui.setconfig('hooks', k, None)
             unbundle = other_repo.getbundle('incoming', common=common,
                                             heads=rheads)
-            buf = io.BytesIO()
             buf = BytesIO()
             while True:
                 chunk = unbundle._stream.read(1024 * 4)
                 if not chunk:
                     break
                 buf.write(chunk)

0 comments (0 inline, 0 general)