mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	Some zulip => humbug updates in comments and print statements.
(imported from commit 9253569a1df7f96fda81ab162d710cdda03f30ca)
This commit is contained in:
		@@ -126,7 +126,7 @@ class Client(object):
 | 
			
		||||
                return False
 | 
			
		||||
            if self.verbose:
 | 
			
		||||
                if not query_state["had_error_retry"]:
 | 
			
		||||
                    sys.stdout.write("humbug API(%s): connection error%s -- retrying." % \
 | 
			
		||||
                    sys.stdout.write("zulip API(%s): connection error%s -- retrying." % \
 | 
			
		||||
                            (url.split(API_VERSTRING, 2)[0], error_string,))
 | 
			
		||||
                    query_state["had_error_retry"] = True
 | 
			
		||||
                else:
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@ parser.add_option('--root-path',
 | 
			
		||||
(options, args) = parser.parse_args()
 | 
			
		||||
 | 
			
		||||
# The 'api' directory needs to go first, so that 'import zulip' won't pick up
 | 
			
		||||
# some other directory named 'humbug'.
 | 
			
		||||
# some other directory named 'zulip'.
 | 
			
		||||
pyzephyr_lib_path = "python-zephyr/build/lib.linux-%s-%s/" % (os.uname()[4], sys.version[0:3])
 | 
			
		||||
sys.path[:0] = [os.path.join(options.root_path, "api/"),
 | 
			
		||||
                os.path.join(options.root_path, "python-zephyr"),
 | 
			
		||||
 
 | 
			
		||||
@@ -60,7 +60,7 @@ subprocess.check_call('./tools/clean-repo')
 | 
			
		||||
os.setpgrp()
 | 
			
		||||
 | 
			
		||||
# Pass --nostatic because we configure static serving ourselves in
 | 
			
		||||
# humbug/urls.py.
 | 
			
		||||
# zulip/urls.py.
 | 
			
		||||
for cmd in ['python manage.py runserver --nostatic %s localhost:%d'
 | 
			
		||||
                % (manage_args, django_port),
 | 
			
		||||
            'python manage.py runtornado %s localhost:%d'
 | 
			
		||||
 
 | 
			
		||||
@@ -733,7 +733,7 @@ def do_convert(md, realm_domain=None, message=None):
 | 
			
		||||
 | 
			
		||||
        cleaned = _sanitize_for_log(md)
 | 
			
		||||
 | 
			
		||||
        # Output error to log as well as sending a humbug and email
 | 
			
		||||
        # Output error to log as well as sending a zulip and email
 | 
			
		||||
        logging.getLogger('').error('Exception in Markdown parser: %sInput (sanitized) was: %s'
 | 
			
		||||
            % (traceback.format_exc(), cleaned))
 | 
			
		||||
        subject = "Markdown parser failure on %s" % (platform.node(),)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
"""
 | 
			
		||||
WSGI config for humbug project.
 | 
			
		||||
WSGI config for zulip project.
 | 
			
		||||
 | 
			
		||||
This module contains the WSGI application used by Django's development server
 | 
			
		||||
and any production WSGI deployments. It should expose a module-level variable
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user