paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint: Clean up E241 PEP-8 rule.

Browse Source
This commit is contained in:
Tim Abbott
2017-01-23 21:21:14 -08:00
parent fe4f7b1170
commit 9cc83f87fc
17 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
analytics/views.py
View File

@@ -973,7 +973,7 @@ def get_realm_activity(request, realm_str):
admin_emails = {admin.email for admin in admins} admin_emails = {admin.email for admin in admins}
for is_bot, page_title in [(False, 'Humans'), (True, 'Bots')]: for is_bot, page_title in [(False, 'Humans'), (True, 'Bots')]:
all_records = list(get_user_activity_records_for_realm(realm_str, is_bot)) all_records = list(get_user_activity_records_for_realm(realm_str, is_bot))
user_records, content = realm_user_summary_table(all_records, admin_emails) user_records, content = realm_user_summary_table(all_records, admin_emails)

2
api/examples/edit-message
View File

@@ -41,7 +41,7 @@ import zulip
parser = optparse.OptionParser(usage=usage) parser = optparse.OptionParser(usage=usage)
parser.add_option('--message-id', default="") parser.add_option('--message-id', default="")
parser.add_option('--subject', default="") parser.add_option('--subject', default="")
parser.add_option('--content', default="") parser.add_option('--content', default="")
parser.add_option_group(zulip.generate_option_group(parser)) parser.add_option_group(zulip.generate_option_group(parser))
(options, args) = parser.parse_args() (options, args) = parser.parse_args()

2
api/examples/send-message
View File

@@ -40,7 +40,7 @@ You can omit --user and --api-key arguments if you have a properly set up ~/.zul
parser = optparse.OptionParser(usage=usage) parser = optparse.OptionParser(usage=usage)
parser.add_option('--subject', default="test") parser.add_option('--subject', default="test")
parser.add_option('--message', default="test message") parser.add_option('--message', default="test message")
parser.add_option('--type', default='private') parser.add_option('--type', default='private')
parser.add_option_group(zulip.generate_option_group(parser)) parser.add_option_group(zulip.generate_option_group(parser))
(options, args) = parser.parse_args() (options, args) = parser.parse_args()

6
api/integrations/nagios/nagios-notify-zulip
View File

@@ -9,10 +9,10 @@ VERSION = "0.9"
# In Nagios, "output" means "first line of output", and "long # In Nagios, "output" means "first line of output", and "long
# output" means "other lines of output". # output" means "other lines of output".
parser = optparse.OptionParser() # type: optparse.OptionParser parser = optparse.OptionParser() # type: optparse.OptionParser
parser.add_option('--output', default='') parser.add_option('--output', default='')
parser.add_option('--long-output', default='') parser.add_option('--long-output', default='')
parser.add_option('--stream', default='nagios') parser.add_option('--stream', default='nagios')
parser.add_option('--config', default='/etc/nagios3/zuliprc') parser.add_option('--config', default='/etc/nagios3/zuliprc')
for opt in ('type', 'host', 'service', 'state'): for opt in ('type', 'host', 'service', 'state'):
parser.add_option('--' + opt) parser.add_option('--' + opt)
(opts, args) = parser.parse_args() # type: Any, List[Text] (opts, args) = parser.parse_args() # type: Any, List[Text]

14
bots/check-mirroring
View File

@@ -76,20 +76,20 @@ if options.sharded:
("message", "p"), ("message", "p"),
("tabbott-nagios-test-32", "0"), ("tabbott-nagios-test-32", "0"),
("tabbott-nagios-test-33", "1"), ("tabbott-nagios-test-33", "1"),
("tabbott-nagios-test-2", "2"), ("tabbott-nagios-test-2", "2"),
("tabbott-nagios-test-5", "3"), ("tabbott-nagios-test-5", "3"),
("tabbott-nagios-test-13", "4"), ("tabbott-nagios-test-13", "4"),
("tabbott-nagios-test-7", "5"), ("tabbott-nagios-test-7", "5"),
("tabbott-nagios-test-22", "6"), ("tabbott-nagios-test-22", "6"),
("tabbott-nagios-test-35", "7"), ("tabbott-nagios-test-35", "7"),
("tabbott-nagios-test-4", "8"), ("tabbott-nagios-test-4", "8"),
("tabbott-nagios-test-3", "9"), ("tabbott-nagios-test-3", "9"),
("tabbott-nagios-test-1", "a"), ("tabbott-nagios-test-1", "a"),
("tabbott-nagios-test-49", "b"), ("tabbott-nagios-test-49", "b"),
("tabbott-nagios-test-34", "c"), ("tabbott-nagios-test-34", "c"),
("tabbott-nagios-test-12", "d"), ("tabbott-nagios-test-12", "d"),
("tabbott-nagios-test-11", "e"), ("tabbott-nagios-test-11", "e"),
("tabbott-nagios-test-9", "f"), ("tabbott-nagios-test-9", "f"),
] ]
for (stream, test) in test_streams: for (stream, test) in test_streams:
if stream == "message": if stream == "message":

2
corporate/urls.py
View File

@@ -7,7 +7,7 @@ i18n_urlpatterns = [
url(r'^zephyr-mirror/$', TemplateView.as_view(template_name='corporate/zephyr-mirror.html')), url(r'^zephyr-mirror/$', TemplateView.as_view(template_name='corporate/zephyr-mirror.html')),
# Terms of service and privacy policy # Terms of service and privacy policy
url(r'^terms-enterprise/$', TemplateView.as_view(template_name='corporate/terms-enterprise.html')), url(r'^terms-enterprise/$', TemplateView.as_view(template_name='corporate/terms-enterprise.html')),
url(r'^privacy/$', TemplateView.as_view(template_name='corporate/privacy.html')), url(r'^privacy/$', TemplateView.as_view(template_name='corporate/privacy.html')),
] ]

2
tools/lint-all
View File

@@ -87,7 +87,7 @@ def check_pep8(files):
# ignored. It either doesn't fit with the style of the project or should # ignored. It either doesn't fit with the style of the project or should
# actually be cleaned up. # actually be cleaned up.
# #
'E123', 'E126', 'E226', 'E241', 'E261', 'E302', 'E123', 'E126', 'E226', 'E261', 'E302',
'E401', 'E501', 'E702', 'E401', 'E501', 'E702',
# #

2
tools/review
View File

@@ -47,7 +47,7 @@ def create_pull_branch(pull_id):
print() print()
print('PR: %d' % (pull_id,)) print('PR: %d' % (pull_id,))
print(subprocess.check_output(['git', 'log', 'HEAD~..', print(subprocess.check_output(['git', 'log', 'HEAD~..',
'--pretty=format:Author: %an'])) '--pretty=format:Author: %an']))
def review_pr(): def review_pr():

54
zerver/context_processors.py
View File

@@ -35,34 +35,34 @@ def add_settings(request):
realm_uri = settings.SERVER_URI realm_uri = settings.SERVER_URI
return { return {
'custom_logo_url': settings.CUSTOM_LOGO_URL, 'custom_logo_url': settings.CUSTOM_LOGO_URL,
'register_link_disabled': settings.REGISTER_LINK_DISABLED, 'register_link_disabled': settings.REGISTER_LINK_DISABLED,
'login_link_disabled': settings.LOGIN_LINK_DISABLED, 'login_link_disabled': settings.LOGIN_LINK_DISABLED,
'about_link_disabled': settings.ABOUT_LINK_DISABLED, 'about_link_disabled': settings.ABOUT_LINK_DISABLED,
'show_oss_announcement': settings.SHOW_OSS_ANNOUNCEMENT, 'show_oss_announcement': settings.SHOW_OSS_ANNOUNCEMENT,
'zulip_admin': settings.ZULIP_ADMINISTRATOR, 'zulip_admin': settings.ZULIP_ADMINISTRATOR,
'terms_of_service': settings.TERMS_OF_SERVICE, 'terms_of_service': settings.TERMS_OF_SERVICE,
'login_url': settings.HOME_NOT_LOGGED_IN, 'login_url': settings.HOME_NOT_LOGGED_IN,
'only_sso': settings.ONLY_SSO, 'only_sso': settings.ONLY_SSO,
'external_api_path': settings.EXTERNAL_API_PATH, 'external_api_path': settings.EXTERNAL_API_PATH,
'external_api_uri': settings.EXTERNAL_API_URI, 'external_api_uri': settings.EXTERNAL_API_URI,
'external_host': settings.EXTERNAL_HOST, 'external_host': settings.EXTERNAL_HOST,
'external_uri_scheme': settings.EXTERNAL_URI_SCHEME, 'external_uri_scheme': settings.EXTERNAL_URI_SCHEME,
'realm_uri': realm_uri, 'realm_uri': realm_uri,
'server_uri': settings.SERVER_URI, 'server_uri': settings.SERVER_URI,
'api_site_required': settings.EXTERNAL_API_PATH != "api.zulip.com", 'api_site_required': settings.EXTERNAL_API_PATH != "api.zulip.com",
'email_integration_enabled': settings.EMAIL_GATEWAY_BOT != "", 'email_integration_enabled': settings.EMAIL_GATEWAY_BOT != "",
'email_gateway_example': settings.EMAIL_GATEWAY_EXAMPLE, 'email_gateway_example': settings.EMAIL_GATEWAY_EXAMPLE,
'open_realm_creation': settings.OPEN_REALM_CREATION, 'open_realm_creation': settings.OPEN_REALM_CREATION,
'password_auth_enabled': password_auth_enabled(realm), 'password_auth_enabled': password_auth_enabled(realm),
'dev_auth_enabled': dev_auth_enabled(realm), 'dev_auth_enabled': dev_auth_enabled(realm),
'google_auth_enabled': google_auth_enabled(realm), 'google_auth_enabled': google_auth_enabled(realm),
'github_auth_enabled': github_auth_enabled(realm), 'github_auth_enabled': github_auth_enabled(realm),
'development_environment': settings.DEVELOPMENT, 'development_environment': settings.DEVELOPMENT,
'support_email': settings.ZULIP_ADMINISTRATOR, 'support_email': settings.ZULIP_ADMINISTRATOR,
'find_team_link_disabled': settings.FIND_TEAM_LINK_DISABLED, 'find_team_link_disabled': settings.FIND_TEAM_LINK_DISABLED,
'password_min_length': settings.PASSWORD_MIN_LENGTH, 'password_min_length': settings.PASSWORD_MIN_LENGTH,
'password_min_quality': settings.PASSWORD_MIN_ZXCVBN_QUALITY, 'password_min_quality': settings.PASSWORD_MIN_ZXCVBN_QUALITY,
} }

12
zerver/lib/bugdown/__init__.py
View File

@@ -735,7 +735,7 @@ def fixup_link(link, target_blank=True):
"""Set certain attributes we want on every link.""" """Set certain attributes we want on every link."""
if target_blank: if target_blank:
link.set('target', '_blank') link.set('target', '_blank')
link.set('title', url_filename(link.get('href'))) link.set('title', url_filename(link.get('href')))
def sanitize_url(url): def sanitize_url(url):
@@ -1337,11 +1337,11 @@ def do_convert(content, message=None, message_realm=None, possible_words=None):
if possible_words is None: if possible_words is None:
possible_words = set() # Set[Text] possible_words = set() # Set[Text]
db_data = {'possible_words': possible_words, db_data = {'possible_words': possible_words,
'full_names': dict((user['full_name'].lower(), user) for user in realm_users), 'full_names': dict((user['full_name'].lower(), user) for user in realm_users),
'short_names': dict((user['short_name'].lower(), user) for user in realm_users), 'short_names': dict((user['short_name'].lower(), user) for user in realm_users),
'emoji': message_realm.get_emoji(), 'emoji': message_realm.get_emoji(),
'stream_names': dict((stream['name'], stream) for stream in realm_streams)} 'stream_names': dict((stream['name'], stream) for stream in realm_streams)}
try: try:
# Spend at most 5 seconds rendering. # Spend at most 5 seconds rendering.

4
zerver/management/commands/check_redis.py
View File

@@ -73,5 +73,5 @@ than max_api_calls! (trying to trim) %s %s" % (key, count))
# elements to trim. We'd have to go through every list item and take # elements to trim. We'd have to go through every list item and take
# the intersection. The best we can do is expire it # the intersection. The best we can do is expire it
self._check_within_range(zset, self._check_within_range(zset,
lambda: client.zcount(zset, 0, now), lambda: client.zcount(zset, 0, now),
lambda key, max_calls: None) lambda key, max_calls: None)

12
zerver/models.py
View File

@@ -551,8 +551,8 @@ class UserProfile(ModelReprMixin, AbstractBaseUser, PermissionsMixin):
TUTORIAL_WAITING = u'W' TUTORIAL_WAITING = u'W'
TUTORIAL_STARTED = u'S' TUTORIAL_STARTED = u'S'
TUTORIAL_FINISHED = u'F' TUTORIAL_FINISHED = u'F'
TUTORIAL_STATES = ((TUTORIAL_WAITING, "Waiting"), TUTORIAL_STATES = ((TUTORIAL_WAITING, "Waiting"),
(TUTORIAL_STARTED, "Started"), (TUTORIAL_STARTED, "Started"),
(TUTORIAL_FINISHED, "Finished")) (TUTORIAL_FINISHED, "Finished"))
tutorial_status = models.CharField(default=TUTORIAL_WAITING, choices=TUTORIAL_STATES, max_length=1) # type: Text tutorial_status = models.CharField(default=TUTORIAL_WAITING, choices=TUTORIAL_STATES, max_length=1) # type: Text
@@ -655,8 +655,8 @@ class PushDeviceToken(models.Model):
GCM = 2 GCM = 2
KINDS = ( KINDS = (
(APNS, 'apns'), (APNS, 'apns'),
(GCM, 'gcm'), (GCM, 'gcm'),
) )
kind = models.PositiveSmallIntegerField(choices=KINDS) # type: int kind = models.PositiveSmallIntegerField(choices=KINDS) # type: int
@@ -750,8 +750,8 @@ class Recipient(ModelReprMixin, models.Model):
# N.B. If we used Django's choice=... we would get this for free (kinda) # N.B. If we used Django's choice=... we would get this for free (kinda)
_type_names = { _type_names = {
PERSONAL: 'personal', PERSONAL: 'personal',
STREAM: 'stream', STREAM: 'stream',
HUDDLE: 'huddle'} HUDDLE: 'huddle'}
def type_name(self): def type_name(self):
# type: () -> str # type: () -> str

4
zerver/tests/test_bugdown.py
View File

@@ -456,7 +456,7 @@ class BugdownTest(TestCase):
converted_subject = bugdown.subject_links(realm.id, msg.subject) converted_subject = bugdown.subject_links(realm.id, msg.subject)
self.assertEqual(converted, '<p>We should fix <a href="https://trac.zulip.net/ticket/224" target="_blank" title="https://trac.zulip.net/ticket/224">#224</a> and <a href="https://trac.zulip.net/ticket/115" target="_blank" title="https://trac.zulip.net/ticket/115">#115</a>, but not issue#124 or #1124z or <a href="https://trac.zulip.net/ticket/16" target="_blank" title="https://trac.zulip.net/ticket/16">trac #15</a> today.</p>') self.assertEqual(converted, '<p>We should fix <a href="https://trac.zulip.net/ticket/224" target="_blank" title="https://trac.zulip.net/ticket/224">#224</a> and <a href="https://trac.zulip.net/ticket/115" target="_blank" title="https://trac.zulip.net/ticket/115">#115</a>, but not issue#124 or #1124z or <a href="https://trac.zulip.net/ticket/16" target="_blank" title="https://trac.zulip.net/ticket/16">trac #15</a> today.</p>')
self.assertEqual(converted_subject, [u'https://trac.zulip.net/ticket/444']) self.assertEqual(converted_subject, [u'https://trac.zulip.net/ticket/444'])
RealmFilter(realm=realm, pattern=r'#(?P<id>[a-zA-Z]+-[0-9]+)', RealmFilter(realm=realm, pattern=r'#(?P<id>[a-zA-Z]+-[0-9]+)',
url_format_string=r'https://trac.zulip.net/ticket/%(id)s').save() url_format_string=r'https://trac.zulip.net/ticket/%(id)s').save()
@@ -532,7 +532,7 @@ class BugdownTest(TestCase):
boring_msg = Message(sender=get_user_profile_by_email("othello@zulip.com"), boring_msg = Message(sender=get_user_profile_by_email("othello@zulip.com"),
subject=u"no match here") subject=u"no match here")
converted_boring_subject = bugdown.subject_links(realm.id, boring_msg.subject) converted_boring_subject = bugdown.subject_links(realm.id, boring_msg.subject)
self.assertEqual(converted_boring_subject, []) self.assertEqual(converted_boring_subject, [])
def test_is_status_message(self): def test_is_status_message(self):
# type: () -> None # type: () -> None

32
zproject/legacy_urls.py
View File

@@ -14,27 +14,27 @@ import zerver.views.muting
legacy_urls = [ legacy_urls = [
# These are json format views used by the web client. They require a logged in browser. # These are json format views used by the web client. They require a logged in browser.
url(r'^json/invite_users$', zerver.views.invite.json_invite_users), url(r'^json/invite_users$', zerver.views.invite.json_invite_users),
url(r'^json/bulk_invite_users$', zerver.views.invite.json_bulk_invite_users), url(r'^json/bulk_invite_users$', zerver.views.invite.json_bulk_invite_users),
url(r'^json/refer_friend$', zerver.views.invite.json_refer_friend), url(r'^json/refer_friend$', zerver.views.invite.json_refer_friend),
url(r'^json/settings/change$', zerver.views.user_settings.json_change_settings), url(r'^json/settings/change$', zerver.views.user_settings.json_change_settings),
# We should remove this endpoint and all code related to it. # We should remove this endpoint and all code related to it.
# It returns a 404 if the stream doesn't exist, which is confusing # It returns a 404 if the stream doesn't exist, which is confusing
# for devs, and I don't think we need to go to the server # for devs, and I don't think we need to go to the server
# any more to find out about subscriptions, since they are already # any more to find out about subscriptions, since they are already
# pushed to us via the event system. # pushed to us via the event system.
url(r'^json/subscriptions/exists$', zerver.views.streams.json_stream_exists), url(r'^json/subscriptions/exists$', zerver.views.streams.json_stream_exists),
url(r'^json/subscriptions/property$', zerver.views.streams.json_subscription_property), url(r'^json/subscriptions/property$', zerver.views.streams.json_subscription_property),
url(r'^json/fetch_api_key$', zerver.views.auth.json_fetch_api_key), url(r'^json/fetch_api_key$', zerver.views.auth.json_fetch_api_key),
url(r'^json/tutorial_send_message$', zerver.views.tutorial.json_tutorial_send_message), url(r'^json/tutorial_send_message$', zerver.views.tutorial.json_tutorial_send_message),
url(r'^json/tutorial_status$', zerver.views.tutorial.json_tutorial_status), url(r'^json/tutorial_status$', zerver.views.tutorial.json_tutorial_status),
url(r'^json/report_error$', zerver.views.report.json_report_error), url(r'^json/report_error$', zerver.views.report.json_report_error),
url(r'^json/report_send_time$', zerver.views.report.json_report_send_time), url(r'^json/report_send_time$', zerver.views.report.json_report_send_time),
url(r'^json/report_narrow_time$', zerver.views.report.json_report_narrow_time), url(r'^json/report_narrow_time$', zerver.views.report.json_report_narrow_time),
url(r'^json/report_unnarrow_time$', zerver.views.report.json_report_unnarrow_time), url(r'^json/report_unnarrow_time$', zerver.views.report.json_report_unnarrow_time),
url(r'^json/upload_file$', zerver.views.upload.json_upload_file), url(r'^json/upload_file$', zerver.views.upload.json_upload_file),
url(r'^json/messages_in_narrow$', zerver.views.messages.json_messages_in_narrow), url(r'^json/messages_in_narrow$', zerver.views.messages.json_messages_in_narrow),
url(r'^json/set_muted_topics$', zerver.views.muting.json_set_muted_topics), url(r'^json/set_muted_topics$', zerver.views.muting.json_set_muted_topics),
] ]

56
zproject/settings.py
View File

@@ -426,9 +426,9 @@ SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
CACHES = { CACHES = {
'default': { 'default': {
'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache', 'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
'LOCATION': MEMCACHED_LOCATION, 'LOCATION': MEMCACHED_LOCATION,
'TIMEOUT': 3600, 'TIMEOUT': 3600,
'OPTIONS': { 'OPTIONS': {
'verify_keys': True, 'verify_keys': True,
'tcp_nodelay': True, 'tcp_nodelay': True,
@@ -436,8 +436,8 @@ CACHES = {
} }
}, },
'database': { 'database': {
'BACKEND': 'django.core.cache.backends.db.DatabaseCache', 'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
'LOCATION': 'third_party_api_results', 'LOCATION': 'third_party_api_results',
# Basically never timeout. Setting to 0 isn't guaranteed # Basically never timeout. Setting to 0 isn't guaranteed
# to work, see https://code.djangoproject.com/ticket/9595 # to work, see https://code.djangoproject.com/ticket/9595
'TIMEOUT': 2000000000, 'TIMEOUT': 2000000000,
@@ -659,7 +659,7 @@ PIPELINE = {
# in frontend_tests/zjsunit/output.js as needed. # in frontend_tests/zjsunit/output.js as needed.
'activity': { 'activity': {
'source_filenames': ('styles/activity.css',), 'source_filenames': ('styles/activity.css',),
'output_filename': 'min/activity.css' 'output_filename': 'min/activity.css'
}, },
'portico': { 'portico': {
'source_filenames': ( 'source_filenames': (
@@ -734,22 +734,22 @@ JS_SPECS = {
'third/bootstrap/js/bootstrap.js', 'third/bootstrap/js/bootstrap.js',
'js/common.js', 'js/common.js',
], ],
'output_filename': 'min/common.js' 'output_filename': 'min/common.js'
}, },
'signup': { 'signup': {
'source_filenames': [ 'source_filenames': [
'js/portico/signup.js', 'js/portico/signup.js',
'node_modules/jquery-validation/dist/jquery.validate.js', 'node_modules/jquery-validation/dist/jquery.validate.js',
], ],
'output_filename': 'min/signup.js' 'output_filename': 'min/signup.js'
}, },
'api': { 'api': {
'source_filenames': ['js/portico/api.js'], 'source_filenames': ['js/portico/api.js'],
'output_filename': 'min/api.js' 'output_filename': 'min/api.js'
}, },
'app_debug': { 'app_debug': {
'source_filenames': ['js/debug.js'], 'source_filenames': ['js/debug.js'],
'output_filename': 'min/app_debug.js' 'output_filename': 'min/app_debug.js'
}, },
'app': { 'app': {
'source_filenames': [ 'source_filenames': [
@@ -951,60 +951,60 @@ LOGGING = {
}, },
'handlers': { 'handlers': {
'zulip_admins': { 'zulip_admins': {
'level': 'ERROR', 'level': 'ERROR',
'class': 'zerver.logging_handlers.AdminZulipHandler', 'class': 'zerver.logging_handlers.AdminZulipHandler',
# For testing the handler delete the next line # For testing the handler delete the next line
'filters': ['ZulipLimiter', 'require_debug_false', 'require_really_deployed'], 'filters': ['ZulipLimiter', 'require_debug_false', 'require_really_deployed'],
'formatter': 'default' 'formatter': 'default'
}, },
'console': { 'console': {
'level': 'DEBUG', 'level': 'DEBUG',
'class': 'logging.StreamHandler', 'class': 'logging.StreamHandler',
'formatter': 'default' 'formatter': 'default'
}, },
'file': { 'file': {
'level': 'DEBUG', 'level': 'DEBUG',
'class': 'logging.handlers.WatchedFileHandler', 'class': 'logging.handlers.WatchedFileHandler',
'formatter': 'default', 'formatter': 'default',
'filename': FILE_LOG_PATH, 'filename': FILE_LOG_PATH,
}, },
'errors_file': { 'errors_file': {
'level': 'WARNING', 'level': 'WARNING',
'class': 'logging.handlers.WatchedFileHandler', 'class': 'logging.handlers.WatchedFileHandler',
'formatter': 'default', 'formatter': 'default',
'filename': ERROR_FILE_LOG_PATH, 'filename': ERROR_FILE_LOG_PATH,
}, },
}, },
'loggers': { 'loggers': {
'': { '': {
'handlers': ['console', 'file', 'errors_file'], 'handlers': ['console', 'file', 'errors_file'],
'level': 'INFO', 'level': 'INFO',
'propagate': False, 'propagate': False,
}, },
'django': { 'django': {
'handlers': (['zulip_admins'] if ERROR_REPORTING else [] + 'handlers': (['zulip_admins'] if ERROR_REPORTING else [] +
['console', 'file', 'errors_file']), ['console', 'file', 'errors_file']),
'level': 'INFO', 'level': 'INFO',
'propagate': False, 'propagate': False,
}, },
'zulip.requests': { 'zulip.requests': {
'handlers': ['console', 'file', 'errors_file'], 'handlers': ['console', 'file', 'errors_file'],
'level': 'INFO', 'level': 'INFO',
'propagate': False, 'propagate': False,
}, },
'zulip.queue': { 'zulip.queue': {
'handlers': ['console', 'file', 'errors_file'], 'handlers': ['console', 'file', 'errors_file'],
'level': 'WARNING', 'level': 'WARNING',
'propagate': False, 'propagate': False,
}, },
'zulip.management': { 'zulip.management': {
'handlers': ['file', 'errors_file'], 'handlers': ['file', 'errors_file'],
'level': 'INFO', 'level': 'INFO',
'propagate': False, 'propagate': False,
}, },
'requests': { 'requests': {
'handlers': ['console', 'file', 'errors_file'], 'handlers': ['console', 'file', 'errors_file'],
'level': 'WARNING', 'level': 'WARNING',
'propagate': False, 'propagate': False,
}, },
'django.security.DisallowedHost': { 'django.security.DisallowedHost': {

4
zproject/test_settings.py
View File

@@ -87,9 +87,9 @@ TUTORIAL_ENABLED = False
# Disable use of memcached for caching # Disable use of memcached for caching
CACHES['database'] = { CACHES['database'] = {
'BACKEND': 'django.core.cache.backends.dummy.DummyCache', 'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
'LOCATION': 'zulip-database-test-cache', 'LOCATION': 'zulip-database-test-cache',
'TIMEOUT': 3600, 'TIMEOUT': 3600,
'CONN_MAX_AGE': 600, 'CONN_MAX_AGE': 600,
'OPTIONS': { 'OPTIONS': {
'MAX_ENTRIES': 100000 'MAX_ENTRIES': 100000

4
zproject/urls.py
View File

@@ -116,7 +116,7 @@ i18n_urls = [
# Login/registration # Login/registration
url(r'^register/$', zerver.views.registration.accounts_home, name='register'), url(r'^register/$', zerver.views.registration.accounts_home, name='register'),
url(r'^login/$', zerver.views.auth.login_page, {'template_name': 'zerver/login.html'}, name='zerver.views.auth.login_page'), url(r'^login/$', zerver.views.auth.login_page, {'template_name': 'zerver/login.html'}, name='zerver.views.auth.login_page'),
# A registration page that passes through the domain, for totally open realms. # A registration page that passes through the domain, for totally open realms.
url(r'^register/(?P<realm_str>\S+)/$', zerver.views.registration.accounts_home_with_realm_str, url(r'^register/(?P<realm_str>\S+)/$', zerver.views.registration.accounts_home_with_realm_str,
@@ -141,7 +141,7 @@ i18n_urls = [
# If a Terms of Service is supplied, add that route # If a Terms of Service is supplied, add that route
if settings.TERMS_OF_SERVICE is not None: if settings.TERMS_OF_SERVICE is not None:
i18n_urls += [url(r'^terms/$', TemplateView.as_view(template_name='zerver/terms.html'))] i18n_urls += [url(r'^terms/$', TemplateView.as_view(template_name='zerver/terms.html'))]
# Make a copy of i18n_urls so that they appear without prefix for english # Make a copy of i18n_urls so that they appear without prefix for english
urls = list(i18n_urls) urls = list(i18n_urls)