Changeset - 7e9d3865b4f9
Parent rev.
Child rev.
[Not reviewed]
default
0 4 0
Mads Kiilerich - 6 years ago 2020-01-22 22:30:13
mads@kiilerich.com
Grafted from: ba85f7670991
py3: support new stdlib module names configparser, urllib and http lib

From "2to3 -f imports".
4 files changed with 11 insertions and 11 deletions:
kallithea/bin/ldap_sync.py
1
1
kallithea/lib/helpers.py
2
2
kallithea/tests/functional/test_login.py
6
6
kallithea/tests/scripts/manual_test_crawler.py
2
2
0 comments (0 inline, 0 general)
kallithea/bin/ldap_sync.py
➞
Show inline comments
 
@@ -26,13 +26,13 @@ Original author and date, and relevant c
 
"""
 

			




	
	
	
		
 
from __future__ import print_function

			




	
	
	
		
 

			




	
	
	
		
 
import urllib2

			




	
	
	
		
 
import uuid

			




	
	
	
		
 
from ConfigParser import ConfigParser

			




	
	
	
		
 
from configparser import ConfigParser

			




	
	
	
		
 

			




	
	
	
		
 
import ldap

			




	
	
	
		
 

			




	
	
	
		
 
from kallithea.lib import ext_json

			




	
	
	
		
 
from kallithea.lib.utils2 import ascii_bytes

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/lib/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -20,13 +20,13 @@ available to Controllers. This module is

			




	
	
	
		
 
import hashlib

			




	
	
	
		
 
import json

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import random

			




	
	
	
		
 
import re

			




	
	
	
		
 
import textwrap

			




	
	
	
		
 
import urlparse

			




	
	
	
		
 
import urllib.parse

			




	
	
	
		
 

			




	
	
	
		
 
from beaker.cache import cache_region

			




	
	
	
		
 
from pygments import highlight as code_highlight

			




	
	
	
		
 
from pygments.formatters.html import HtmlFormatter

			




	
	
	
		
 
from tg.i18n import ugettext as _

			




	
	
	
		
 
from webhelpers2.html import HTML, escape, literal

			




	
	
		
 
@@ -929,13 +929,13 @@ def gravatar_url(email_address, size=30,

			




	
	
	
		
 
    _def = 'anonymous@kallithea-scm.org'  # default gravatar

			




	
	
	
		
 
    email_address = email_address or _def

			




	
	
	
		
 

			




	
	
	
		
 
    if email_address == _def:

			




	
	
	
		
 
        return default

			




	
	
	
		
 

			




	
	
	
		
 
    parsed_url = urlparse.urlparse(url.current(qualified=True))

			




	
	
	
		
 
    parsed_url = urllib.parse.urlparse(url.current(qualified=True))

			




	
	
	
		
 
    url = (c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL) \

			




	
	
	
		
 
               .replace('{email}', email_address) \

			




	
	
	
		
 
               .replace('{md5email}', hashlib.md5(safe_bytes(email_address).lower()).hexdigest()) \

			




	
	
	
		
 
               .replace('{netloc}', parsed_url.netloc) \

			




	
	
	
		
 
               .replace('{scheme}', parsed_url.scheme) \

			




	
	
	
		
 
               .replace('{size}', str(size))

			




        

    


    
    

    

        

                

                    kallithea/tests/functional/test_login.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# -*- coding: utf-8 -*-

			




	
	
	
		
 
import re

			




	
	
	
		
 
import time

			




	
	
	
		
 
import urlparse

			




	
	
	
		
 
import urllib.parse

			




	
	
	
		
 

			




	
	
	
		
 
import mock

			




	
	
	
		
 
from tg.util.webtest import test_context

			




	
	
	
		
 

			




	
	
	
		
 
import kallithea.lib.celerylib.tasks

			




	
	
	
		
 
from kallithea.lib import helpers as h

			




	
	
		
 
@@ -169,25 +169,25 @@ class TestLoginController(base.TestContr

			




	
	
	
		
 
    def test_redirection_to_login_form_preserves_get_args(self, args):

			




	
	
	
		
 
        with fixture.anon_access(False):

			




	
	
	
		
 
            response = self.app.get(base.url(controller='summary', action='index',

			




	
	
	
		
 
                                        repo_name=base.HG_REPO,

			




	
	
	
		
 
                                        **args))

			




	
	
	
		
 
            assert response.status == '302 Found'

			




	
	
	
		
 
            came_from = urlparse.parse_qs(urlparse.urlparse(response.location).query)['came_from'][0]

			




	
	
	
		
 
            came_from_qs = urlparse.parse_qsl(urlparse.urlparse(came_from).query)

			




	
	
	
		
 
            came_from = urllib.parse.parse_qs(urllib.parse.urlparse(response.location).query)['came_from'][0]

			




	
	
	
		
 
            came_from_qs = urllib.parse.parse_qsl(urllib.parse.urlparse(came_from).query)

			




	
	
	
		
 
            assert sorted(came_from_qs) == sorted((k, v.encode('utf-8')) for k, v in args.items())

			




	
	
	
		
 

			




	
	
	
		
 
    @base.parametrize('args,args_encoded', [

			




	
	
	
		
 
        ({'foo':'one', 'bar':'two'}, ('foo=one', 'bar=two')),

			




	
	
	
		
 
        ({'blue': u'blå', 'green':u'grøn'},

			




	
	
	
		
 
             ('blue=bl%C3%A5', 'green=gr%C3%B8n')),

			




	
	
	
		
 
    ])

			




	
	
	
		
 
    def test_login_form_preserves_get_args(self, args, args_encoded):

			




	
	
	
		
 
        response = self.app.get(base.url(controller='login', action='index',

			




	
	
	
		
 
                                    came_from=base.url('/_admin/users', **args)))

			




	
	
	
		
 
        came_from = urlparse.parse_qs(urlparse.urlparse(response.form.action).query)['came_from'][0]

			




	
	
	
		
 
        came_from = urllib.parse.parse_qs(urllib.parse.urlparse(response.form.action).query)['came_from'][0]

			




	
	
	
		
 
        for encoded in args_encoded:

			




	
	
	
		
 
            assert encoded in came_from

			




	
	
	
		
 

			




	
	
	
		
 
    @base.parametrize('args,args_encoded', [

			




	
	
	
		
 
        ({'foo':'one', 'bar':'two'}, ('foo=one', 'bar=two')),

			




	
	
	
		
 
        ({'blue': u'blå', 'green':u'grøn'},

			




	
	
		
 
@@ -213,13 +213,13 @@ class TestLoginController(base.TestContr

			




	
	
	
		
 
                                     came_from=base.url('/_admin/users', **args)),

			




	
	
	
		
 
                                 {'username': 'error',

			




	
	
	
		
 
                                  'password': 'test12',

			




	
	
	
		
 
                                  '_session_csrf_secret_token': self.session_csrf_secret_token()})

			




	
	
	
		
 

			




	
	
	
		
 
        response.mustcontain('Invalid username or password')

			




	
	
	
		
 
        came_from = urlparse.parse_qs(urlparse.urlparse(response.form.action).query)['came_from'][0]

			




	
	
	
		
 
        came_from = urllib.parse.parse_qs(urllib.parse.urlparse(response.form.action).query)['came_from'][0]

			




	
	
	
		
 
        for encoded in args_encoded:

			




	
	
	
		
 
            assert encoded in came_from

			




	
	
	
		
 

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # REGISTRATIONS

			




	
	
	
		
 
    #==========================================================================

			




	
	
		
 
@@ -426,13 +426,13 @@ class TestLoginController(base.TestContr

			




	
	
	
		
 
        assert recipients == ['username@example.com']

			




	
	
	
		
 
        assert subject == 'Password reset link'

			




	
	
	
		
 
        assert '\n%s\n' % token in body

			




	
	
	
		
 
        (confirmation_url,) = (line for line in body.splitlines() if line.startswith('http://'))

			




	
	
	
		
 
        assert ' href="%s"' % confirmation_url.replace('&', '&').replace('@', '%40') in html_body

			




	
	
	
		
 

			




	
	
	
		
 
        d = urlparse.parse_qs(urlparse.urlparse(confirmation_url).query)

			




	
	
	
		
 
        d = urllib.parse.parse_qs(urllib.parse.urlparse(confirmation_url).query)

			




	
	
	
		
 
        assert d['token'] == [token]

			




	
	
	
		
 
        assert d['timestamp'] == [str(timestamp)]

			




	
	
	
		
 
        assert d['email'] == [email]

			




	
	
	
		
 

			




	
	
	
		
 
        response = response.follow()

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/tests/scripts/manual_test_crawler.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -29,13 +29,13 @@ Original author and date, and relevant c

			




	
	
	
		
 
:copyright: (c) 2013 RhodeCode GmbH, and others.

			




	
	
	
		
 
:license: GPLv3, see LICENSE.md for more details.

			




	
	
	
		
 
"""

			




	
	
	
		
 

			




	
	
	
		
 
from __future__ import print_function

			




	
	
	
		
 

			




	
	
	
		
 
import cookielib

			




	
	
	
		
 
import http.cookiejar

			




	
	
	
		
 
import os

			




	
	
	
		
 
import sys

			




	
	
	
		
 
import tempfile

			




	
	
	
		
 
import time

			




	
	
	
		
 
import urllib

			




	
	
	
		
 
import urllib2

			




	
	
		
 
@@ -69,13 +69,13 @@ PROJECTS = [

			




	
	
	
		
 
    # 'linux-magx-pbranch',

			




	
	
	
		
 
    'CPython',

			




	
	
	
		
 
    'kallithea',

			




	
	
	
		
 
]

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
cj = cookielib.FileCookieJar(os.path.join(tempfile.gettempdir(), 'rc_test_cookie.txt'))

			




	
	
	
		
 
cj = http.cookiejar.FileCookieJar(os.path.join(tempfile.gettempdir(), 'rc_test_cookie.txt'))

			




	
	
	
		
 
o = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))

			




	
	
	
		
 
o.addheaders = [

			




	
	
	
		
 
    ('User-agent', 'kallithea-crawler'),

			




	
	
	
		
 
    ('Accept-Language', 'en - us, en;q = 0.5')

			




	
	
	
		
 
]

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.