kallithea Changeset - b6d23aa3754c

Changeset - b6d23aa3754c

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2011-12-21 05:19:28
marcin@python-works.com

fixed problem with uploading files into rhodecode that wasn't detected as streams

1 file changed with 8 insertions and 1 deletions:

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -26,6 +26,7 @@ import os @@
 import time
 import traceback
 import logging
 import cStringIO
 from vcs import get_backend
 from vcs.exceptions import RepositoryError
@@ @@ -60,6 +61,7 @@ class RepoTemp(object): @@
     def __repr__(self):
         return "<%s('id:%s')>" % (self.__class__.__name__, self.repo_id)
 class CachedRepoList(object):
     def __init__(self, db_repo_list, repos_path, order_by=None):
@@ @@ -112,6 +114,7 @@ class CachedRepoList(object): @@
             tmp_d['dbrepo_fork'] = dbr.fork.get_dict() if dbr.fork else {}
             yield tmp_d
 class ScmModel(BaseModel):
     """
     Generic Scm Model
@@ @@ -359,8 +362,12 @@ class ScmModel(BaseModel): @@
         if isinstance(content, (basestring,)):
             content = safe_str(content)
         elif isinstance(content, file):
+        elif isinstance(content, (file, cStringIO.OutputType,)):
             content = content.read()
         else:
             raise Exception('Content is of unrecognized type %s' % (
                 type(content)
             ))
         message = safe_str(message)
         path = safe_str(f_path)

0 comments (0 inline, 0 general)