Changeset - 0cfd77281853
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 6 years ago 2019-11-25 02:46:02
mads@kiilerich.com
Grafted from: 12dca3a1321d
cleanup: convert some StringIO use to use the py3 compatible io module
2 files changed with 6 insertions and 6 deletions:
kallithea/bin/kallithea_cli_base.py
4
4
kallithea/tests/vcs/test_archives.py
2
2
0 comments (0 inline, 0 general)
kallithea/bin/kallithea_cli_base.py
➞
Show inline comments
 
@@ -9,14 +9,14 @@
 
# 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/>.
 

			




	
	
	
		
 
import cStringIO

			




	
	
	
		
 
import functools

			




	
	
	
		
 
import io

			




	
	
	
		
 
import logging.config

			




	
	
	
		
 
import os

			




	
	
	
		
 
import re

			




	
	
	
		
 
import sys

			




	
	
	
		
 

			




	
	
	
		
 
import click

			




	
	
		
 
@@ -41,13 +41,13 @@ def read_config(ini_file_name, strip_sec

			




	
	
	
		
 
    def repl(m):

			




	
	
	
		
 
        if m.group(1) == strip_section_prefix:

			




	
	
	
		
 
            return '[%s]' % m.group(2)

			




	
	
	
		
 
        return m.group(0)

			




	
	
	
		
 

			




	
	
	
		
 
    with open(ini_file_name) as f:

			




	
	
	
		
 
        return re.sub(r'^\[([^:]+):(.*)]', repl, f.read(), flags=re.MULTILINE)

			




	
	
	
		
 
        return re.sub(r'^\[([^:]+):(.*)]', repl, f.read().decode(), flags=re.MULTILINE)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
# This placeholder is the main entry point for the kallithea-cli command

			




	
	
	
		
 
@click.group(context_settings=dict(help_option_names=['-h', '--help']))

			




	
	
	
		
 
def cli():

			




	
	
	
		
 
    """Various commands to manage a Kallithea instance."""

			




	
	
		
 
@@ -68,14 +68,14 @@ def register_command(config_file=False, 

			




	
	
	
		
 
            @click.option('--config_file', '-c', help="Path to .ini file with app configuration.",

			




	
	
	
		
 
                type=click.Path(dir_okay=False, exists=True, readable=True), required=True)

			




	
	
	
		
 
            @functools.wraps(annotated) # reuse meta data from the wrapped function so click can see other options

			




	
	
	
		
 
            def runtime_wrapper(config_file, *args, **kwargs):

			




	
	
	
		
 
                path_to_ini_file = os.path.realpath(config_file)

			




	
	
	
		
 
                kallithea.CONFIG = paste.deploy.appconfig('config:' + path_to_ini_file)

			




	
	
	
		
 
                config_bytes = read_config(path_to_ini_file, strip_section_prefix=annotated.__name__)

			




	
	
	
		
 
                logging.config.fileConfig(cStringIO.StringIO(config_bytes))

			




	
	
	
		
 
                config_string = read_config(path_to_ini_file, strip_section_prefix=annotated.__name__)

			




	
	
	
		
 
                logging.config.fileConfig(io.StringIO(config_string))

			




	
	
	
		
 
                if config_file_initialize_app:

			




	
	
	
		
 
                    kallithea.config.middleware.make_app_without_logging(kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf)

			




	
	
	
		
 
                    kallithea.lib.utils.setup_cache_regions(kallithea.CONFIG)

			




	
	
	
		
 
                return annotated(*args, **kwargs)

			




	
	
	
		
 
            return cli_command(runtime_wrapper)

			




	
	
	
		
 
        return annotator

			




        

    


    
    

    

        

                

                    kallithea/tests/vcs/test_archives.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
import datetime

			




	
	
	
		
 
import io

			




	
	
	
		
 
import os

			




	
	
	
		
 
import StringIO

			




	
	
	
		
 
import tarfile

			




	
	
	
		
 
import tempfile

			




	
	
	
		
 
import zipfile

			




	
	
	
		
 

			




	
	
	
		
 
import pytest

			




	
	
	
		
 

			




	
	
		
 
@@ -67,13 +67,13 @@ class ArchivesTestCaseMixin(_BackendTest

			




	
	
	
		
 
            assert open(os.path.join(outdir, 'repo/' + node_path)).read() == self.tip.get_node(node_path).content

			




	
	
	
		
 

			




	
	
	
		
 
    def test_archive_default_stream(self):

			




	
	
	
		
 
        tmppath = tempfile.mkstemp(dir=TESTS_TMP_PATH, prefix='test_archive_default_stream-')[1]

			




	
	
	
		
 
        with open(tmppath, 'wb') as stream:

			




	
	
	
		
 
            self.tip.fill_archive(stream=stream)

			




	
	
	
		
 
        mystream = StringIO.StringIO()

			




	
	
	
		
 
        mystream = io.BytesIO()

			




	
	
	
		
 
        self.tip.fill_archive(stream=mystream)

			




	
	
	
		
 
        mystream.seek(0)

			




	
	
	
		
 
        with open(tmppath, 'rb') as f:

			




	
	
	
		
 
            file_content = f.read()

			




	
	
	
		
 
            stringio_content = mystream.read()

			




	
	
	
		
 
            # the gzip header contains a MTIME header

			




        

    



    


    



    



      

      





    
    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.