# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1457912168 -3600
# Node ID d5e16407bdbb159e26b64824c00f047f31878e08
# Parent  1a7611b9730ebe73721917637b10910cbfd847e1# Parent  c92b6787c8435cd919864bab36e2cc1558367d72
Merge stable

diff -r 1a7611b9730e -r d5e16407bdbb .hgsigs
--- a/.hgsigs	Tue Feb 02 21:45:29 2016 +0100
+++ b/.hgsigs	Mon Mar 14 00:36:08 2016 +0100
@@ -1,1 +1,2 @@
 9b3e9e242f5c97cc0c7657e5ac93dce7de61ca16 0 iQEcBAABAgAGBQJWDuAdAAoJEJ1bI/kYT6UUAlYH/ReCa7Im5tvy+ot5oAc7xey/O2rCVHp2h6i82tTWK/0i9EaS4DP+eTbAjV4WJA4qWF5DPenEJ3X9JhrTLNvGkR0f7lUqiFVMTJ472YlSsvIWg38gVFruzwk1cODRfq72o8ERYcRSfzrL4cDpIqjEd/vVVCV/gKVvPmzr4/FED/ZmS0X6T9gxWJo/eWSuLNAxHHtE/pCWDO3XEe+iOm+hHjkyz4Hn2r9/+ucrirnzycH6DnYO/kWvQzBnzgMjJm+1rLZ5cfU89V8zfhv6z0pd8CHZfpKGc2Z8EwVJq9LR+M4/76uDlYXx7IfZAxhRNqN6MC+yvPmDo3382dNr7Wkopi0=
+9bf8eb837e785b6856ccfac264e977ce3ebe1535 0 iQEcBAABAgAGBQJW5XaVAAoJEJ1bI/kYT6UUbeMH/AsGg21jTc0tTT+228T+WfrfkbxrPkkULQF/Eo3ChlrhnFZ5B1y7ellSx6XGas7yKpqHHtNmrVwY3KBfUaYEljML/osEt1kvM6JGcd0vDbAW1uA2sdJR2AXmf32MjguFVhmYi9Lj79WYtgg241YGPe4dH0ompNFVqazNxCfmDBZijzSkF57FURMpV2e6+MyNq0txSo9Q82eALy0GAIX7NKQcxtynxG9ETzVzuVpeNE9MEZh0ObbUtPGezd55GXXcVqI8ZEurZwf6KHnd5M+5wxIZf84gM/k4QgQbRiIxNj4QfVmTZlVNSkC7PwSbF8twZPjlAprwldYvMi/c7ZVocEY=
diff -r 1a7611b9730e -r d5e16407bdbb .hgtags
--- a/.hgtags	Tue Feb 02 21:45:29 2016 +0100
+++ b/.hgtags	Mon Mar 14 00:36:08 2016 +0100
@@ -62,3 +62,5 @@
 c6e32714336345403adf76abb6ebf9b8116fcdc7 0.2.1
 14f488a5dc4ca6647bc6acf12534fd137e968aa8 0.2.2
 9b3e9e242f5c97cc0c7657e5ac93dce7de61ca16 0.3
+250f8150c4bb0ca00dcb92f49ce9a475545863e8 0.3.1
+9bf8eb837e785b6856ccfac264e977ce3ebe1535 0.3.1
diff -r 1a7611b9730e -r d5e16407bdbb docs/contributing.rst
--- a/docs/contributing.rst	Tue Feb 02 21:45:29 2016 +0100
+++ b/docs/contributing.rst	Mon Mar 14 00:36:08 2016 +0100
@@ -35,7 +35,7 @@
         virtualenv ../kallithea-venv
         source ../kallithea-venv/bin/activate
         pip install --upgrade pip setuptools
-        python2 setup.py develop
+        pip install -e .
         paster make-config Kallithea my.ini
         paster setup-db my.ini --user=user --email=user@example.com --password=password --repos=/tmp
         paster serve my.ini --reload &
diff -r 1a7611b9730e -r d5e16407bdbb docs/installation.rst
--- a/docs/installation.rst	Tue Feb 02 21:45:29 2016 +0100
+++ b/docs/installation.rst	Mon Mar 14 00:36:08 2016 +0100
@@ -40,7 +40,7 @@
         virtualenv ../kallithea-venv
         source ../kallithea-venv/bin/activate
         pip install --upgrade pip setuptools
-        python2 setup.py develop
+        pip install -e .
         python2 setup.py compile_catalog   # for translation of the UI
 
 You can now proceed to :ref:`setup`.
@@ -96,7 +96,7 @@
   Alternatively, download a .tar.gz from http://pypi.python.org/pypi/Kallithea,
   extract it and run::
 
-    python2 setup.py install
+    pip install .
 
 - This will install Kallithea together with pylons_ and all other required
   python libraries into the activated virtualenv.
diff -r 1a7611b9730e -r d5e16407bdbb docs/overview.rst
--- a/docs/overview.rst	Tue Feb 02 21:45:29 2016 +0100
+++ b/docs/overview.rst	Mon Mar 14 00:36:08 2016 +0100
@@ -53,7 +53,7 @@
   updating it is that you take advantage of the most recent improvements. Using
   it directly from a DVCS also means that it is easy to track local customizations.
 
-  Running ``setup.py develop`` in the source will use pip to install the
+  Running ``pip install -e .`` in the source will use pip to install the
   necessary dependencies in the Python environment and create a
   ``.../site-packages/Kallithea.egg-link`` file there that points at the Kallithea
   source.
diff -r 1a7611b9730e -r d5e16407bdbb kallithea/__init__.py
--- a/kallithea/__init__.py	Tue Feb 02 21:45:29 2016 +0100
+++ b/kallithea/__init__.py	Mon Mar 14 00:36:08 2016 +0100
@@ -29,7 +29,7 @@
 import sys
 import platform
 
-VERSION = (0, 3)
+VERSION = (0, 3, 99)
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',
diff -r 1a7611b9730e -r d5e16407bdbb kallithea/lib/auth_modules/auth_pam.py
--- a/kallithea/lib/auth_modules/auth_pam.py	Tue Feb 02 21:45:29 2016 +0100
+++ b/kallithea/lib/auth_modules/auth_pam.py	Mon Mar 14 00:36:08 2016 +0100
@@ -25,7 +25,14 @@
 
 import logging
 import time
-import pam
+
+try:
+    from pam import authenticate as pam_authenticate
+except ImportError:
+    # work around pam.authenticate missing in python-pam 1.8.*
+    from pam import pam
+    pam_authenticate = pam().authenticate
+
 import pwd
 import grp
 import re
@@ -92,7 +99,7 @@
             # Need lock here, as PAM authentication is not thread safe
             _pam_lock.acquire()
             try:
-                auth_result = pam.authenticate(username, password,
+                auth_result = pam_authenticate(username, password,
                                                settings["service"])
                 # cache result only if we properly authenticated
                 if auth_result:
diff -r 1a7611b9730e -r d5e16407bdbb requirements.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/requirements.txt	Mon Mar 14 00:36:08 2016 +0100
@@ -0,0 +1,4 @@
+# requirements.txt file for use as "pip install -r requirements.txt" as a
+# readthedocs compatible alternative to "pip install -e ." which is a working
+# alternative to "setup.py develop" which doesn't work with Mercurial 3.7
+.