From 058587da77f389a428482d0fb818ad349e297133 Mon Sep 17 00:00:00 2001 From: Sahil Dua Date: Sun, 18 Sep 2016 02:59:16 +0200 Subject: [PATCH] Remove extra new lines at the ends of Zulip authoried files. Fixes #1627. [tweaked by tabbott to avoid patching third-party modules, for now] --- .tx/config | 1 - bots/log2zulip | 1 - bots/sync-public-streams | 1 - contrib_bots/lib/readme.md | 1 - docs/custom-apps.md | 1 - docs/index.rst | 1 - docs/integration-guide.md | 2 -- docs/linters.md | 1 - docs/prod-install.md | 1 - docs/testing-with-casper.md | 1 - docs/testing-with-django.md | 1 - docs/testing-with-node.md | 1 - docs/writing-views.md | 2 -- frontend_tests/node_tests/alert_words.js | 1 - frontend_tests/node_tests/dict.js | 2 -- frontend_tests/node_tests/dispatch.js | 2 -- frontend_tests/node_tests/filter.js | 1 - frontend_tests/node_tests/unread.js | 1 - frontend_tests/zjsunit/finder.js | 1 - frontend_tests/zjsunit/namespace.js | 1 - frontend_tests/zjsunit/output.js | 1 - frontend_tests/zjsunit/render.js | 1 - puppet/zulip/manifests/camo.pp | 2 -- puppet/zulip/manifests/nginx.pp | 1 - .../zulip/templates/postgresql/9.3/postgresql.conf.template.erb | 1 - puppet/zulip_internal/files/apache/ports.conf | 1 - puppet/zulip_internal/files/mediawiki/Auth_remoteuser.php | 1 - puppet/zulip_internal/files/sparkle/mac/sparkle.xml | 2 +- puppet/zulip_internal/files/sparkle/sso/mac/sparkle.xml | 2 +- puppet/zulip_internal/files/sparkle/sso/win/sparkle.xml | 2 +- puppet/zulip_internal/files/sparkle/win/sparkle.xml | 2 +- puppet/zulip_internal/files/trac.ini | 1 - scripts/nagios/cron_file_helper.py | 1 - static/js/muting_ui.js | 1 - static/js/resize.js | 1 - static/js/setup.js | 2 -- static/styles/activity.css | 1 - static/styles/fonts.css | 1 - static/styles/settings.css | 1 - static/templates/invite_subscription.handlebars | 1 - templates/confirmation/mituser_confirmation_email_body.txt | 1 - templates/tests/test_markdown.html | 1 - tools/deprecated/stress-test/.gitignore | 1 - tools/do-destroy-rebuild-database | 1 - tools/do-destroy-rebuild-test-database | 1 - tools/fetch-rebase-pull-request | 1 - tools/lib/css_parser.py | 1 - tools/lib/html_grep.py | 1 - tools/setup/postgres-init-dev-db | 1 - tools/show-profile-results.py | 1 - tools/tests/test_css_parser.py | 1 - tools/webpack | 1 - zerver/lib/export.py | 1 - zerver/lib/html_diff.py | 1 - zerver/lib/mandrill_client.py | 1 - zerver/lib/migrate.py | 1 - zerver/lib/parallel.py | 1 - zerver/management/commands/fill_memcached_caches.py | 1 - zerver/management/commands/generate_invite_links.py | 1 - zerver/tests/markdown/test_markdown.md | 2 -- zerver/tests/test_export.py | 1 - zerver/tests/test_external.py | 1 - zerver/tests/test_presence.py | 1 - zerver/tests/test_tutorial.py | 1 - zerver/tests/test_unread.py | 1 - zerver/views/pointer.py | 1 - zerver/views/tutorial.py | 1 - zilencer/tests.py | 1 - 68 files changed, 4 insertions(+), 75 deletions(-) diff --git a/.tx/config b/.tx/config index 244e45fb98..41ddc20c0f 100644 --- a/.tx/config +++ b/.tx/config @@ -14,4 +14,3 @@ source_lang = en type = KEYVALUEJSON file_filter = static/locale//translations.json lang_map = zh-Hans: zh-CN - diff --git a/bots/log2zulip b/bots/log2zulip index 035ba3b6d6..5e1021a1fb 100755 --- a/bots/log2zulip +++ b/bots/log2zulip @@ -110,4 +110,3 @@ if __name__ == "__main__": os.remove(lock_path) except OSError as IOError: pass - diff --git a/bots/sync-public-streams b/bots/sync-public-streams index b225bd120b..08db5da305 100755 --- a/bots/sync-public-streams +++ b/bots/sync-public-streams @@ -64,4 +64,3 @@ if __name__ == "__main__": f.close() subprocess.call(["mv", "/home/zulip/public_streams.tmp", "/home/zulip/public_streams"]) - diff --git a/contrib_bots/lib/readme.md b/contrib_bots/lib/readme.md index b5140c7793..1840f7725b 100644 --- a/contrib_bots/lib/readme.md +++ b/contrib_bots/lib/readme.md @@ -106,4 +106,3 @@ If you are not interested in running your bots on the server, then you can still use the full Zulip API. The hope, though, is that this architecture will make writing simple bots a quick/easy process. - diff --git a/docs/custom-apps.md b/docs/custom-apps.md index 9763bc9306..e0e1ebc948 100644 --- a/docs/custom-apps.md +++ b/docs/custom-apps.md @@ -402,4 +402,3 @@ highly locked down, e.g. enforce that they truly only have read access to Zulip messages. - **UI**: We will want to provide some UI features that give admins and/or regular users visibility into which server-side apps are running. - diff --git a/docs/index.rst b/docs/index.rst index 02653d1d73..1b937d96ff 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -117,4 +117,3 @@ Indices and tables * :ref:`genindex` * :ref:`modindex` * :ref:`search` - diff --git a/docs/integration-guide.md b/docs/integration-guide.md index 6fc06c2e6f..12a7956b1e 100644 --- a/docs/integration-guide.md +++ b/docs/integration-guide.md @@ -582,5 +582,3 @@ request: If you would like feedback on your integration as you go, feel free to submit pull requests as you go, prefixing them with `[WIP]`. - - diff --git a/docs/linters.md b/docs/linters.md index a646ad181a..aa228dcce3 100644 --- a/docs/linters.md +++ b/docs/linters.md @@ -236,4 +236,3 @@ linter or an automated test. Our goal is to have most common style issues by caught by the linters, so new contributors to the codebase can efficiently fix produce code with correct style without needing to go back-and-forth with a reviewer. - diff --git a/docs/prod-install.md b/docs/prod-install.md index 7d72923c12..c905f0f30f 100644 --- a/docs/prod-install.md +++ b/docs/prod-install.md @@ -163,4 +163,3 @@ help" stream in the Zulip developers' chat](https://zulip.tabbott.net/#narrow/stream/installation.20help) for realtime help or email zulip-help@googlegroups.com with the traceback and we'll try to help you out! - diff --git a/docs/testing-with-casper.md b/docs/testing-with-casper.md index ef6b0fd092..1a526f1653 100644 --- a/docs/testing-with-casper.md +++ b/docs/testing-with-casper.md @@ -121,4 +121,3 @@ for writing Casper tests in addition to the debugging notes below: between two `casper.then` blocks actually runs before either of them. See this for more details about how Casper works: - diff --git a/docs/testing-with-django.md b/docs/testing-with-django.md index 5d80fbcfa5..94d7cbb21e 100644 --- a/docs/testing-with-django.md +++ b/docs/testing-with-django.md @@ -242,4 +242,3 @@ modules. You can use the `--coverage` option to generate coverage reports, and new code should have 100% coverage, which generally requires testing not only the "happy path" but also error handling code and edge cases. - diff --git a/docs/testing-with-node.md b/docs/testing-with-node.md index 542000cded..ace98a5acd 100644 --- a/docs/testing-with-node.md +++ b/docs/testing-with-node.md @@ -129,4 +129,3 @@ here is this: > global.narrow.stream = function () { > return 'office'; > }; - diff --git a/docs/writing-views.md b/docs/writing-views.md index d1e6733e26..37509745b2 100644 --- a/docs/writing-views.md +++ b/docs/writing-views.md @@ -362,5 +362,3 @@ def api_pagerduty_webhook(request, user_profile, client, ``` The `client` will be the result of `get_client("ZulipPagerDutyWebhook")` in this example. - - diff --git a/frontend_tests/node_tests/alert_words.js b/frontend_tests/node_tests/alert_words.js index 25e2a17fa6..eb037cac50 100644 --- a/frontend_tests/node_tests/alert_words.js +++ b/frontend_tests/node_tests/alert_words.js @@ -76,4 +76,3 @@ var alert_domain_message = { sender_email: 'another@zulip.com', content: '

now alert_words.process_message(alert_domain_message); assert.equal(alert_domain_message.content, '

now with link www.alerttwo.us/foo/bar

'); }()); - diff --git a/frontend_tests/node_tests/dict.js b/frontend_tests/node_tests/dict.js index 1291c2f943..691842b6a9 100644 --- a/frontend_tests/node_tests/dict.js +++ b/frontend_tests/node_tests/dict.js @@ -171,5 +171,3 @@ set_global('blueslip', {}); d.del('foo'); assert.equal(d.num_items(), 1); }()); - - diff --git a/frontend_tests/node_tests/dispatch.js b/frontend_tests/node_tests/dispatch.js index a25b1017ec..97731ab71c 100644 --- a/frontend_tests/node_tests/dispatch.js +++ b/frontend_tests/node_tests/dispatch.js @@ -721,5 +721,3 @@ run(function (override, capture, args) { assert_same(args.message_id, 99); assert_same(args.new_value, true); // for 'add' }); - - diff --git a/frontend_tests/node_tests/filter.js b/frontend_tests/node_tests/filter.js index 126db7cdcc..f881f43c5f 100644 --- a/frontend_tests/node_tests/filter.js +++ b/frontend_tests/node_tests/filter.js @@ -496,4 +496,3 @@ function get_predicate(operators) { assert.equal(Filter.describe(narrow), string); }()); - diff --git a/frontend_tests/node_tests/unread.js b/frontend_tests/node_tests/unread.js index 77f904b29b..f50ff8c9cd 100644 --- a/frontend_tests/node_tests/unread.js +++ b/frontend_tests/node_tests/unread.js @@ -387,4 +387,3 @@ var zero_counts = { assert(unread.message_unread({flags: []})); assert(!unread.message_unread({flags: ['read']})); }()); - diff --git a/frontend_tests/zjsunit/finder.js b/frontend_tests/zjsunit/finder.js index 28c5251162..376f46264e 100644 --- a/frontend_tests/zjsunit/finder.js +++ b/frontend_tests/zjsunit/finder.js @@ -51,4 +51,3 @@ exports.find_files_to_run = function () { return exports; }()); module.exports = finder; - diff --git a/frontend_tests/zjsunit/namespace.js b/frontend_tests/zjsunit/namespace.js index 0efcaf9631..fd2e2b48cc 100644 --- a/frontend_tests/zjsunit/namespace.js +++ b/frontend_tests/zjsunit/namespace.js @@ -54,4 +54,3 @@ exports.stub_out_jquery = function () { return exports; }()); module.exports = namespace; - diff --git a/frontend_tests/zjsunit/output.js b/frontend_tests/zjsunit/output.js index 1f6013689b..0e2ef6553d 100644 --- a/frontend_tests/zjsunit/output.js +++ b/frontend_tests/zjsunit/output.js @@ -120,4 +120,3 @@ exports.append_test_output = function (output) { return exports; }()); module.exports = output; - diff --git a/frontend_tests/zjsunit/render.js b/frontend_tests/zjsunit/render.js index d9099e4935..7da6a93dcf 100644 --- a/frontend_tests/zjsunit/render.js +++ b/frontend_tests/zjsunit/render.js @@ -39,4 +39,3 @@ exports.use_template = function (name) { return exports; }()); module.exports = render; - diff --git a/puppet/zulip/manifests/camo.pp b/puppet/zulip/manifests/camo.pp index e890f7e34a..c668f216cd 100644 --- a/puppet/zulip/manifests/camo.pp +++ b/puppet/zulip/manifests/camo.pp @@ -16,5 +16,3 @@ class zulip::camo { content => template("zulip/camo_defaults.template.erb"), } } - - diff --git a/puppet/zulip/manifests/nginx.pp b/puppet/zulip/manifests/nginx.pp index ec93c2e0f6..a1bdd634f8 100644 --- a/puppet/zulip/manifests/nginx.pp +++ b/puppet/zulip/manifests/nginx.pp @@ -50,4 +50,3 @@ class zulip::nginx { ensure => running, } } - diff --git a/puppet/zulip/templates/postgresql/9.3/postgresql.conf.template.erb b/puppet/zulip/templates/postgresql/9.3/postgresql.conf.template.erb index 531461c1f1..0f92a3f80c 100644 --- a/puppet/zulip/templates/postgresql/9.3/postgresql.conf.template.erb +++ b/puppet/zulip/templates/postgresql/9.3/postgresql.conf.template.erb @@ -574,4 +574,3 @@ log_autovacuum_min_duration = 100 autovacuum_freeze_max_age = 2000000000 vacuum_freeze_min_age = 1000000000 vacuum_freeze_table_age = 1800000000 - diff --git a/puppet/zulip_internal/files/apache/ports.conf b/puppet/zulip_internal/files/apache/ports.conf index 41a215f230..cc4b2320a1 100644 --- a/puppet/zulip_internal/files/apache/ports.conf +++ b/puppet/zulip_internal/files/apache/ports.conf @@ -24,4 +24,3 @@ Listen 80 Listen 443 - diff --git a/puppet/zulip_internal/files/mediawiki/Auth_remoteuser.php b/puppet/zulip_internal/files/mediawiki/Auth_remoteuser.php index 953d4eb03a..a463489f74 100644 --- a/puppet/zulip_internal/files/mediawiki/Auth_remoteuser.php +++ b/puppet/zulip_internal/files/mediawiki/Auth_remoteuser.php @@ -429,4 +429,3 @@ class Auth_remoteuser extends AuthPlugin { return ucfirst( $username ); } } - diff --git a/puppet/zulip_internal/files/sparkle/mac/sparkle.xml b/puppet/zulip_internal/files/sparkle/mac/sparkle.xml index 203499c11f..286af1cda3 100755 --- a/puppet/zulip_internal/files/sparkle/mac/sparkle.xml +++ b/puppet/zulip_internal/files/sparkle/mac/sparkle.xml @@ -84,4 +84,4 @@ - \ No newline at end of file + diff --git a/puppet/zulip_internal/files/sparkle/sso/mac/sparkle.xml b/puppet/zulip_internal/files/sparkle/sso/mac/sparkle.xml index 4865d8086a..02241615fc 100755 --- a/puppet/zulip_internal/files/sparkle/sso/mac/sparkle.xml +++ b/puppet/zulip_internal/files/sparkle/sso/mac/sparkle.xml @@ -47,4 +47,4 @@ - \ No newline at end of file + diff --git a/puppet/zulip_internal/files/sparkle/sso/win/sparkle.xml b/puppet/zulip_internal/files/sparkle/sso/win/sparkle.xml index 0da95af0ee..59f3f06bad 100755 --- a/puppet/zulip_internal/files/sparkle/sso/win/sparkle.xml +++ b/puppet/zulip_internal/files/sparkle/sso/win/sparkle.xml @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/puppet/zulip_internal/files/sparkle/win/sparkle.xml b/puppet/zulip_internal/files/sparkle/win/sparkle.xml index 6c9d819758..e7a276bfa6 100755 --- a/puppet/zulip_internal/files/sparkle/win/sparkle.xml +++ b/puppet/zulip_internal/files/sparkle/win/sparkle.xml @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/puppet/zulip_internal/files/trac.ini b/puppet/zulip_internal/files/trac.ini index 5cb0c71cb5..d531c75870 100644 --- a/puppet/zulip_internal/files/trac.ini +++ b/puppet/zulip_internal/files/trac.ini @@ -218,4 +218,3 @@ max_size = 262144 render_unsafe_content = false safe_schemes = cvs, file, ftp, git, irc, http, https, news, sftp, smb, ssh, svn, svn+ssh split_page_names = false - diff --git a/scripts/nagios/cron_file_helper.py b/scripts/nagios/cron_file_helper.py index 7b9d5268cb..0021a8bbf9 100644 --- a/scripts/nagios/cron_file_helper.py +++ b/scripts/nagios/cron_file_helper.py @@ -35,4 +35,3 @@ def nagios_from_file(results_file): data = pieces[3] return (ret, "%s: %s" % (state, data)) - diff --git a/static/js/muting_ui.js b/static/js/muting_ui.js index 276e904849..82653b7445 100644 --- a/static/js/muting_ui.js +++ b/static/js/muting_ui.js @@ -121,4 +121,3 @@ $(function () { return exports; }()); - diff --git a/static/js/resize.js b/static/js/resize.js index 4e6b532d8c..71136f5be2 100644 --- a/static/js/resize.js +++ b/static/js/resize.js @@ -259,4 +259,3 @@ exports.handler = function (e) { return exports; }()); - diff --git a/static/js/setup.js b/static/js/setup.js index 6237ec1735..a6c04698f2 100644 --- a/static/js/setup.js +++ b/static/js/setup.js @@ -42,5 +42,3 @@ $(function () { } }); - - diff --git a/static/styles/activity.css b/static/styles/activity.css index 8c11d6fea8..23f3db7a60 100644 --- a/static/styles/activity.css +++ b/static/styles/activity.css @@ -48,4 +48,3 @@ tr.admin td:first-child { font-weight: bold; color: #c00; } - diff --git a/static/styles/fonts.css b/static/styles/fonts.css index 783cff01d8..f8ef587c72 100644 --- a/static/styles/fonts.css +++ b/static/styles/fonts.css @@ -141,4 +141,3 @@ font-style: italic; } - diff --git a/static/styles/settings.css b/static/styles/settings.css index 93463b9e27..d762e84bf9 100644 --- a/static/styles/settings.css +++ b/static/styles/settings.css @@ -471,4 +471,3 @@ input[type=checkbox].inline-block { word-break: break-all; white-space: normal; } - diff --git a/static/templates/invite_subscription.handlebars b/static/templates/invite_subscription.handlebars index b47bc7eb2c..d7ecfd5039 100644 --- a/static/templates/invite_subscription.handlebars +++ b/static/templates/invite_subscription.handlebars @@ -10,4 +10,3 @@ {{/each}} - diff --git a/templates/confirmation/mituser_confirmation_email_body.txt b/templates/confirmation/mituser_confirmation_email_body.txt index ac1f9b2b65..b462cca2d5 100644 --- a/templates/confirmation/mituser_confirmation_email_body.txt +++ b/templates/confirmation/mituser_confirmation_email_body.txt @@ -19,4 +19,3 @@ problems. Cheers, All of us here at Zulip - diff --git a/templates/tests/test_markdown.html b/templates/tests/test_markdown.html index b55726f2b8..3cef4e13f1 100644 --- a/templates/tests/test_markdown.html +++ b/templates/tests/test_markdown.html @@ -3,4 +3,3 @@ header {{ markdown_test_file|render_markdown_path }} footer - diff --git a/tools/deprecated/stress-test/.gitignore b/tools/deprecated/stress-test/.gitignore index a56a7ef437..3c3629e647 100644 --- a/tools/deprecated/stress-test/.gitignore +++ b/tools/deprecated/stress-test/.gitignore @@ -1,2 +1 @@ node_modules - diff --git a/tools/do-destroy-rebuild-database b/tools/do-destroy-rebuild-database index 679fe2d723..14d3959d61 100755 --- a/tools/do-destroy-rebuild-database +++ b/tools/do-destroy-rebuild-database @@ -19,4 +19,3 @@ python manage.py populate_db -n100 --threads=1 if [ -e ~/.zuliprc ]; then python manage.py sync_api_key fi - diff --git a/tools/do-destroy-rebuild-test-database b/tools/do-destroy-rebuild-test-database index 7cd9e44b03..2f51c211e4 100755 --- a/tools/do-destroy-rebuild-test-database +++ b/tools/do-destroy-rebuild-test-database @@ -4,4 +4,3 @@ set -x # This is a really simple wrapper script, pretty much for documenting clarity "`dirname "$0"`/../tools/setup/generate-fixtures" --force - diff --git a/tools/fetch-rebase-pull-request b/tools/fetch-rebase-pull-request index a9e2e9cb52..bb484a8f7e 100755 --- a/tools/fetch-rebase-pull-request +++ b/tools/fetch-rebase-pull-request @@ -7,4 +7,3 @@ git fetch upstream "pull/$request_id/head" git checkout upstream/master -b "review-${request_id}" git reset --hard FETCH_HEAD git pull --rebase - diff --git a/tools/lib/css_parser.py b/tools/lib/css_parser.py index e8d08c3fa7..074734ff9d 100644 --- a/tools/lib/css_parser.py +++ b/tools/lib/css_parser.py @@ -503,4 +503,3 @@ def tokenize(text): advance(len(s)) return tokens - diff --git a/tools/lib/html_grep.py b/tools/lib/html_grep.py index 3905a4e04b..947e4d7a90 100644 --- a/tools/lib/html_grep.py +++ b/tools/lib/html_grep.py @@ -61,4 +61,3 @@ def grep(fns, words): # type: (List[str], Set[str]) -> None grepper = Grepper(fns) grepper.grep(words) - diff --git a/tools/setup/postgres-init-dev-db b/tools/setup/postgres-init-dev-db index 3d47caa9e6..ddc0eba964 100755 --- a/tools/setup/postgres-init-dev-db +++ b/tools/setup/postgres-init-dev-db @@ -85,4 +85,3 @@ EOF sh "$(dirname "$0")/../../scripts/setup/flush-memcached" echo "Database created" - diff --git a/tools/show-profile-results.py b/tools/show-profile-results.py index 791db8a0ea..5adb55c29c 100755 --- a/tools/show-profile-results.py +++ b/tools/show-profile-results.py @@ -22,4 +22,3 @@ except: p = pstats.Stats(fn) p.strip_dirs().sort_stats('cumulative').print_stats(25) p.strip_dirs().sort_stats('time').print_stats(25) - diff --git a/tools/tests/test_css_parser.py b/tools/tests/test_css_parser.py index d25bd4b1cc..e82e7e36a7 100644 --- a/tools/tests/test_css_parser.py +++ b/tools/tests/test_css_parser.py @@ -188,4 +188,3 @@ class ParserTestSadPath(unittest.TestCase): }''' error = 'Comments in selector section are not allowed' self._assert_error(my_css, error) - diff --git a/tools/webpack b/tools/webpack index c3f130732d..1066347aa9 100755 --- a/tools/webpack +++ b/tools/webpack @@ -36,4 +36,3 @@ if args.watch: run_watch(args.port) else: run() - diff --git a/zerver/lib/export.py b/zerver/lib/export.py index ad909a7dd0..fe22ac6f9e 100644 --- a/zerver/lib/export.py +++ b/zerver/lib/export.py @@ -1587,4 +1587,3 @@ def import_attachments(data): cursor.executemany(sql_template, tups) logging.info('Successfully imported M2M table %s' % (m2m_table_name,)) - diff --git a/zerver/lib/html_diff.py b/zerver/lib/html_diff.py index e6e7e75eb5..1bba649339 100644 --- a/zerver/lib/html_diff.py +++ b/zerver/lib/html_diff.py @@ -127,4 +127,3 @@ def highlight_html_differences(s1, s2): return s2 return retval - diff --git a/zerver/lib/mandrill_client.py b/zerver/lib/mandrill_client.py index f307c2b94c..0b3e8f4716 100644 --- a/zerver/lib/mandrill_client.py +++ b/zerver/lib/mandrill_client.py @@ -15,4 +15,3 @@ def get_mandrill_client(): MAIL_CLIENT = mandrill.Mandrill(settings.MANDRILL_API_KEY) return MAIL_CLIENT - diff --git a/zerver/lib/migrate.py b/zerver/lib/migrate.py index 5019b37e66..77ab205be1 100644 --- a/zerver/lib/migrate.py +++ b/zerver/lib/migrate.py @@ -122,4 +122,3 @@ def act_on_message_ranges(db, orm, tasks, batch_size=5000, sleep=0.5): min_id = upper + 1 time.sleep(sleep) - diff --git a/zerver/lib/parallel.py b/zerver/lib/parallel.py index 14b32091f5..768943b285 100644 --- a/zerver/lib/parallel.py +++ b/zerver/lib/parallel.py @@ -73,4 +73,3 @@ if __name__ == "__main__": print(jobs) print(expected_output) print(output) - diff --git a/zerver/management/commands/fill_memcached_caches.py b/zerver/management/commands/fill_memcached_caches.py index 74968f637c..73ce591b0f 100644 --- a/zerver/management/commands/fill_memcached_caches.py +++ b/zerver/management/commands/fill_memcached_caches.py @@ -19,4 +19,3 @@ class Command(BaseCommand): for cache in cache_fillers.keys(): fill_remote_cache(cache) - diff --git a/zerver/management/commands/generate_invite_links.py b/zerver/management/commands/generate_invite_links.py index 6015e88778..4cd834b993 100644 --- a/zerver/management/commands/generate_invite_links.py +++ b/zerver/management/commands/generate_invite_links.py @@ -63,4 +63,3 @@ class Command(BaseCommand): prereg_user = PreregistrationUser(email=email) prereg_user.save() print(email + ": " + Confirmation.objects.get_link_for_object(prereg_user)) - diff --git a/zerver/tests/markdown/test_markdown.md b/zerver/tests/markdown/test_markdown.md index 253262bdf1..90af2ab958 100644 --- a/zerver/tests/markdown/test_markdown.md +++ b/zerver/tests/markdown/test_markdown.md @@ -2,5 +2,3 @@ This is some *bold text*. - - diff --git a/zerver/tests/test_export.py b/zerver/tests/test_export.py index 84d13772ab..c59bf2f3d2 100644 --- a/zerver/tests/test_export.py +++ b/zerver/tests/test_export.py @@ -310,4 +310,3 @@ class ExportTest(TestCase): dummy_user_emails = get_set('zerver_userprofile_mirrordummy', 'email') self.assertIn('iago@zulip.com', dummy_user_emails) self.assertNotIn('cordelia@zulip.com', dummy_user_emails) - diff --git a/zerver/tests/test_external.py b/zerver/tests/test_external.py index 948c4229cf..469923c27d 100644 --- a/zerver/tests/test_external.py +++ b/zerver/tests/test_external.py @@ -126,4 +126,3 @@ class RateLimitTests(ZulipTestCase): result = self.send_api_message(email, api_key, "Good message") self.assert_json_success(result) - diff --git a/zerver/tests/test_presence.py b/zerver/tests/test_presence.py index bf6a3007cd..feee692c11 100644 --- a/zerver/tests/test_presence.py +++ b/zerver/tests/test_presence.py @@ -182,4 +182,3 @@ class UserPresenceTests(ZulipTestCase): # We only want @zulip.com emails for email in json['presences'].keys(): self.assertEqual(split_email_to_domain(email), 'zulip.com') - diff --git a/zerver/tests/test_tutorial.py b/zerver/tests/test_tutorial.py index ec3701bb8a..e1cac744a7 100644 --- a/zerver/tests/test_tutorial.py +++ b/zerver/tests/test_tutorial.py @@ -80,4 +80,3 @@ class TutorialTests(ZulipTestCase): self.assert_json_success(result) user = get_user_profile_by_email(email) self.assertEqual(user.tutorial_status, expected_db_status) - diff --git a/zerver/tests/test_unread.py b/zerver/tests/test_unread.py index 06b74d24d8..891655cc42 100644 --- a/zerver/tests/test_unread.py +++ b/zerver/tests/test_unread.py @@ -250,4 +250,3 @@ class UnreadCountTests(ZulipTestCase): "topic_name": invalid_topic_name, "stream_name": "Denmark"}) self.assert_json_error(result, 'No such topic \'abc\'') - diff --git a/zerver/views/pointer.py b/zerver/views/pointer.py index a52590287d..a293f1aaf4 100644 --- a/zerver/views/pointer.py +++ b/zerver/views/pointer.py @@ -52,4 +52,3 @@ def get_profile_backend(request, user_profile): result['max_message_id'] = messages[0].id return json_success(result) - diff --git a/zerver/views/tutorial.py b/zerver/views/tutorial.py index 998a193f7b..0468aa05c0 100644 --- a/zerver/views/tutorial.py +++ b/zerver/views/tutorial.py @@ -41,4 +41,3 @@ def json_tutorial_status(request, user_profile, user_profile.save(update_fields=["tutorial_status"]) return json_success() - diff --git a/zilencer/tests.py b/zilencer/tests.py index 1c29adb73b..df0130e98d 100644 --- a/zilencer/tests.py +++ b/zilencer/tests.py @@ -19,4 +19,3 @@ class EndpointDiscoveryTest(TestCase): data = ujson.loads(response.content) self.assertEqual(data["result"]["base_site_url"], "https://zulip.com/") self.assertEqual(data["result"]["base_api_url"], "https://api.zulip.com/") -