kallithea Changeset - f0437ae274df

Changeset - f0437ae274df

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 3 0

Marcin Kuzminski - 14 years ago 2011-10-20 00:36:11
marcin@python-works.com

Automated merge with https://bitbucket.org/marcinkuzminski/rhodecode

3 files changed with 14 insertions and 11 deletions:

rhodecode/lib/__init__.py

rhodecode/lib/auth_ldap.py

rhodecode/model/db.py

0 comments (0 inline, 0 general)

rhodecode/lib/__init__.py

➞

Show inline comments

@@ @@ -394,13 +394,12 @@ def get_current_revision(quiet=False): @@
     try:
         from vcs import get_repo
         from vcs.utils.helpers import get_scm
         from vcs.exceptions import RepositoryError, VCSError
         repopath = os.path.join(os.path.dirname(__file__), '..', '..')
         scm = get_scm(repopath)[0]
         repo = get_repo(path=repopath, alias=scm)
         tip = repo.get_changeset()
         return (tip.revision, tip.short_id)
-    except (ImportError, RepositoryError, VCSError), err:
+    except Exception, err:
         if not quiet:
             print ("Cannot retrieve rhodecode's revision. Original error "
                    "was: %s" % err)

rhodecode/lib/auth_ldap.py

➞

Show inline comments

@@ @@ -53,8 +53,10 @@ class AuthLdap(object): @@
         if self.TLS_KIND == 'LDAPS':
             port = port or 689
             ldap_server_type = ldap_server_type + 's'
         self.TLS_REQCERT = ldap.__dict__['OPT_X_TLS_' + tls_reqcert]
         OPT_X_TLS_DEMAND = 2
         self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert,
                                    OPT_X_TLS_DEMAND)
         self.LDAP_SERVER_ADDRESS = server
         self.LDAP_SERVER_PORT = port
@@ @@ -63,12 +65,12 @@ class AuthLdap(object): @@
         self.LDAP_BIND_PASS = bind_pass
         self.LDAP_SERVER = "%s://%s:%s" % (ldap_server_type,
                                                self.LDAP_SERVER_ADDRESS,
                                                self.LDAP_SERVER_PORT)
                                            self.LDAP_SERVER_ADDRESS,
                                            self.LDAP_SERVER_PORT)
         self.BASE_DN = base_dn
         self.LDAP_FILTER = ldap_filter
-        self.SEARCH_SCOPE = ldap.__dict__['SCOPE_' + search_scope]
+        self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope)
         self.attr_login = attr_login
     def authenticate_ldap(self, username, password):
@@ @@ -88,7 +90,9 @@ class AuthLdap(object): @@
         if "," in username:
             raise LdapUsernameError("invalid character in username: ,")
         try:
             ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, '/etc/openldap/cacerts')
             if hasattr(ldap,'OPT_X_TLS_CACERTDIR'):
                 ldap.set_option(ldap.OPT_X_TLS_CACERTDIR,
                                 '/etc/openldap/cacerts')
             ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF)
             ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON)
             ldap.set_option(ldap.OPT_TIMEOUT, 20)

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -422,10 +422,10 @@ class UsersGroup(Base, BaseModel): @@
                     Session.flush()
                     members_list = []
                     if v:
                         v = [v] if isinstance(v, basestring) else v
                         for u_id in set(v):
                             members_list.append(UsersGroupMember(
                                                             users_group_id,
                                                             u_id))
                             member = UsersGroupMember(users_group_id,u_id)
                             members_list.append(member)
                     setattr(users_group, 'members', members_list)
                 setattr(users_group, k, v)

0 comments (0 inline, 0 general)