kallithea Changeset - f7b24987d5fb

Changeset - f7b24987d5fb

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-04-06 20:35:50
marcin@python-works.com

fixed setup.py file to use same platform as defined in main rhodecode PLATFORM_OTHERS,
added docs for lib

2 files changed with 23 insertions and 8 deletions:

rhodecode/lib/__init__.py

setup.py

0 comments (0 inline, 0 general)

rhodecode/lib/__init__.py

➞

Show inline comments

@@ @@ -20,35 +20,49 @@ @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # 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/>.
 def str2bool(s):
     if s is None:
 def str2bool(_str):
     """
     returs True/False value from given string, it tries to translate the
     string into boolean
     :param _str: string value to translate into boolean
     :rtype: boolean
     :returns: boolean from given string
     """
     if _str is None:
         return False
     if s in (True, False):
         return s
     s = str(s).strip().lower()
     return s in ('t', 'true', 'y', 'yes', 'on', '1')
     if _str in (True, False):
         return _str
     _str = str(_str).strip().lower()
     return _str in ('t', 'true', 'y', 'yes', 'on', '1')
 def generate_api_key(username, salt=None):
     """
     Generates uniq API key for given username
     Generates unique API key for given username,if salt is not given
     it'll be generated from some random string
     :param username: username as string
     :param salt: salt to hash generate KEY
     :rtype: str
     :returns: sha1 hash from username+salt
     """
     from tempfile import _RandomNameSequence
     import hashlib
     if salt is None:
         salt = _RandomNameSequence().next()
     return hashlib.sha1(username + salt).hexdigest()
 def safe_unicode(_str, from_encoding='utf8'):
     """
     safe unicode function. In case of UnicodeDecode error we try to return
     unicode with errors replace
     :param _str: string to decode

setup.py

➞

Show inline comments

 import sys
 from rhodecode import get_version
 from rhodecode import __platform__
 from rhodecode import __license__
 from rhodecode import PLATFORM_OTHERS
 py_version = sys.version_info
 if py_version < (2, 5):
     raise Exception('RhodeCode requires python 2.5 or later')
@@ @@ -33,13 +34,13 @@ classifiers = ['Development Status :: 4 @@
                'Programming Language :: Python :: 2.7', ]
 if py_version < (2, 6):
     requirements.append("simplejson")
     requirements.append("pysqlite")
-if __platform__ in ('Linux', 'Darwin'):
+if __platform__ in PLATFORM_OTHERS:
     requirements.append("py-bcrypt")
 #additional files from project that goes somewhere in the filesystem
 #relative to sys.prefix
 data_files = []

0 comments (0 inline, 0 general)