Mercurial > kallithea

changeset 2044:fa74e91695a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Marcin Kuzminski <marcin@python-works.com>
date Sun, 26 Feb 2012 21:56:03 +0200
parents e2b866093cba (current diff) ef2f75e99c3e (diff)
children 79a95f338fd0
files docs/changelog.rst rhodecode/__init__.py rhodecode/lib/__init__.py
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/__init__.py	Sun Feb 26 21:41:44 2012 +0200
+++ b/rhodecode/__init__.py	Sun Feb 26 21:56:03 2012 +0200
@@ -26,7 +26,7 @@
 import sys
 import platform
 
-VERSION = (1, 3, 0)
+VERSION = (1, 3, 1)
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
 __dbversion__ = 5  # defines current db version for migrations
 __platform__ = platform.system()
--- a/rhodecode/lib/__init__.py	Sun Feb 26 21:41:44 2012 +0200
+++ b/rhodecode/lib/__init__.py	Sun Feb 26 21:56:03 2012 +0200
@@ -232,6 +232,7 @@
     :returns: str object
     """
     
+    # if it's not basestr cast to str
     if not isinstance(unicode_, basestring):
         return str(unicode_)