Mercurial > kallithea
comparison rhodecode/lib/vcs/nodes.py @ 4116:ffd45b185016 rhodecode-2.2.5-gpl
Imported some of the GPLv3'd changes from RhodeCode v2.2.5.
This imports changes between changesets 21af6c4eab3d and 6177597791c2 in
RhodeCode's original repository, including only changes to Python files and HTML.
RhodeCode clearly licensed its changes to these files under GPLv3
in their /LICENSE file, which states the following:
The Python code and integrated HTML are licensed under the GPLv3 license.
(See:
https://code.rhodecode.com/rhodecode/files/v2.2.5/LICENSE
or
http://web.archive.org/web/20140512193334/https://code.rhodecode.com/rhodecode/files/f3b123159901f15426d18e3dc395e8369f70ebe0/LICENSE
for an online copy of that LICENSE file)
Conservancy reviewed these changes and confirmed that they can be licensed as
a whole to the Kallithea project under GPLv3-only.
While some of the contents committed herein are clearly licensed
GPLv3-or-later, on the whole we must assume the are GPLv3-only, since the
statement above from RhodeCode indicates that they intend GPLv3-only as their
license, per GPLv3ยง14 and other relevant sections of GPLv3.
author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
---|---|
date | Wed, 02 Jul 2014 19:03:13 -0400 |
parents | 5293d4bbb1ea |
children | 7e5f8c12a3fc |
comparison
equal
deleted
inserted
replaced
4115:8b7294a804a0 | 4116:ffd45b185016 |
---|---|
324 if (isinstance(self._mimetype, (tuple, list,)) and | 324 if (isinstance(self._mimetype, (tuple, list,)) and |
325 len(self._mimetype) == 2): | 325 len(self._mimetype) == 2): |
326 return self._mimetype | 326 return self._mimetype |
327 else: | 327 else: |
328 raise NodeError('given _mimetype attribute must be an 2 ' | 328 raise NodeError('given _mimetype attribute must be an 2 ' |
329 'element list or tuple') | 329 'element list or tuple') |
330 | 330 |
331 mtype, encoding = mimetypes.guess_type(self.name) | 331 mtype, encoding = mimetypes.guess_type(self.name) |
332 | 332 |
333 if mtype is None: | 333 if mtype is None: |
334 if self.is_binary: | 334 if self.is_binary: |
335 mtype = 'application/octet-stream' | 335 mtype = 'application/octet-stream' |
336 encoding = None | 336 encoding = None |
337 else: | 337 else: |
338 mtype = 'text/plain' | 338 mtype = 'text/plain' |
339 encoding = None | 339 encoding = None |
340 | |
341 #try with pygments | |
342 try: | |
343 from pygments.lexers import get_lexer_for_filename | |
344 mt = get_lexer_for_filename(self.name).mimetypes | |
345 except Exception: | |
346 mt = None | |
347 | |
348 if mt: | |
349 mtype = mt[0] | |
350 | |
340 return mtype, encoding | 351 return mtype, encoding |
341 | 352 |
342 @LazyProperty | 353 @LazyProperty |
343 def mimetype(self): | 354 def mimetype(self): |
344 """ | 355 """ |