Index: multiplexer.fcgi
===================================================================
--- a/multiplexer.fcgi
+++ b/multiplexer.fcgi
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
Index: multiplexer.py
===================================================================
--- a/multiplexer.py
+++ b/multiplexer.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
Index: sitescripts/__init__.py
===================================================================
--- a/sitescripts/__init__.py
+++ b/sitescripts/__init__.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/content_blocker_lists/bin/generate_lists.py
===================================================================
--- a/sitescripts/content_blocker_lists/bin/generate_lists.py
+++ b/sitescripts/content_blocker_lists/bin/generate_lists.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
# This file is part of Adblock Plus ,
# Copyright (C) 2006-2016 Eyeo GmbH
Index: sitescripts/crashes/web/submitCrash.py
===================================================================
--- a/sitescripts/crashes/web/submitCrash.py
+++ b/sitescripts/crashes/web/submitCrash.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/crawler/bin/import_sites.py
===================================================================
--- a/sitescripts/crawler/bin/import_sites.py
+++ b/sitescripts/crawler/bin/import_sites.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/extensions/bin/createNightlies.py
===================================================================
--- a/sitescripts/extensions/bin/createNightlies.py
+++ b/sitescripts/extensions/bin/createNightlies.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/extensions/bin/updateRecommendations.py
===================================================================
--- a/sitescripts/extensions/bin/updateRecommendations.py
+++ b/sitescripts/extensions/bin/updateRecommendations.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/extensions/bin/updateUpdateManifests.py
===================================================================
--- a/sitescripts/extensions/bin/updateUpdateManifests.py
+++ b/sitescripts/extensions/bin/updateUpdateManifests.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/extensions/utils.py
===================================================================
--- a/sitescripts/extensions/utils.py
+++ b/sitescripts/extensions/utils.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/extensions/web/adblockbrowserUpdates.py
===================================================================
--- a/sitescripts/extensions/web/adblockbrowserUpdates.py
+++ b/sitescripts/extensions/web/adblockbrowserUpdates.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/extensions/web/downloads.py
===================================================================
--- a/sitescripts/extensions/web/downloads.py
+++ b/sitescripts/extensions/web/downloads.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/formmail/web/formmail.py
===================================================================
--- a/sitescripts/formmail/web/formmail.py
+++ b/sitescripts/formmail/web/formmail.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/management/bin/generateHgAuth.py
===================================================================
--- a/sitescripts/management/bin/generateHgAuth.py
+++ b/sitescripts/management/bin/generateHgAuth.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/management/bin/generateNotifications.py
===================================================================
--- a/sitescripts/management/bin/generateNotifications.py
+++ b/sitescripts/management/bin/generateNotifications.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/management/bin/installChanges.py
===================================================================
--- a/sitescripts/management/bin/installChanges.py
+++ b/sitescripts/management/bin/installChanges.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/management/bin/start_services.py
===================================================================
--- a/sitescripts/management/bin/start_services.py
+++ b/sitescripts/management/bin/start_services.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/notifications/parser.py
===================================================================
--- a/sitescripts/notifications/parser.py
+++ b/sitescripts/notifications/parser.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/notifications/test/notification.py
===================================================================
--- a/sitescripts/notifications/test/notification.py
+++ b/sitescripts/notifications/test/notification.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/notifications/test/parser.py
===================================================================
--- a/sitescripts/notifications/test/parser.py
+++ b/sitescripts/notifications/test/parser.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/notifications/web/notification.py
===================================================================
--- a/sitescripts/notifications/web/notification.py
+++ b/sitescripts/notifications/web/notification.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/bin/mailDigests.py
===================================================================
--- a/sitescripts/reports/bin/mailDigests.py
+++ b/sitescripts/reports/bin/mailDigests.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/bin/parseNewReports.py
===================================================================
--- a/sitescripts/reports/bin/parseNewReports.py
+++ b/sitescripts/reports/bin/parseNewReports.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
@@ -277,12 +275,12 @@
itemPath = keyPath + '.item'
limit = lengthRestrictions.get(itemPath, lengthRestrictions['default_string'])
if len(data[key][i]) > limit:
- data[key][i] = data[key][i][0:limit] + u'…'
+ data[key][i] = data[key][i][0:limit] + u'\u2026'
reportData['warnings'][itemPath] = 'Field %s exceeded length limit and was truncated' % itemPath
elif isinstance(data[key], basestring):
limit = lengthRestrictions.get(keyPath, lengthRestrictions['default_string'])
if len(data[key]) > limit:
- data[key] = data[key][0:limit] + u'…'
+ data[key] = data[key][0:limit] + u'\u2026'
reportData['warnings'][keyPath] = 'Field %s exceeded length limit and was truncated' % keyPath
if __name__ == '__main__':
Index: sitescripts/reports/bin/processReports.py
===================================================================
--- a/sitescripts/reports/bin/processReports.py
+++ b/sitescripts/reports/bin/processReports.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/bin/removeOldReports.py
===================================================================
--- a/sitescripts/reports/bin/removeOldReports.py
+++ b/sitescripts/reports/bin/removeOldReports.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/bin/removeOldUsers.py
===================================================================
--- a/sitescripts/reports/bin/removeOldUsers.py
+++ b/sitescripts/reports/bin/removeOldUsers.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/bin/updateDigests.py
===================================================================
--- a/sitescripts/reports/bin/updateDigests.py
+++ b/sitescripts/reports/bin/updateDigests.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/bin/updateSubscriptionList.py
===================================================================
--- a/sitescripts/reports/bin/updateSubscriptionList.py
+++ b/sitescripts/reports/bin/updateSubscriptionList.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/utils.py
===================================================================
--- a/sitescripts/reports/utils.py
+++ b/sitescripts/reports/utils.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/web/showDigest.py
===================================================================
--- a/sitescripts/reports/web/showDigest.py
+++ b/sitescripts/reports/web/showDigest.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/web/showUser.py
===================================================================
--- a/sitescripts/reports/web/showUser.py
+++ b/sitescripts/reports/web/showUser.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/web/submitReport.py
===================================================================
--- a/sitescripts/reports/web/submitReport.py
+++ b/sitescripts/reports/web/submitReport.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/reports/web/updateReport.py
===================================================================
--- a/sitescripts/reports/web/updateReport.py
+++ b/sitescripts/reports/web/updateReport.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/send_installation_link/web/send_installation_link.py
===================================================================
--- a/sitescripts/send_installation_link/web/send_installation_link.py
+++ b/sitescripts/send_installation_link/web/send_installation_link.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/stats/bin/logprocessor.py
===================================================================
--- a/sitescripts/stats/bin/logprocessor.py
+++ b/sitescripts/stats/bin/logprocessor.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/stats/bin/pagegenerator.py
===================================================================
--- a/sitescripts/stats/bin/pagegenerator.py
+++ b/sitescripts/stats/bin/pagegenerator.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/stats/common.py
===================================================================
--- a/sitescripts/stats/common.py
+++ b/sitescripts/stats/common.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/stats/test/common.py
===================================================================
--- a/sitescripts/stats/test/common.py
+++ b/sitescripts/stats/test/common.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/stats/test/logprocessor.py
===================================================================
--- a/sitescripts/stats/test/logprocessor.py
+++ b/sitescripts/stats/test/logprocessor.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/submit_email/web/submit_email.py
===================================================================
--- a/sitescripts/submit_email/web/submit_email.py
+++ b/sitescripts/submit_email/web/submit_email.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/bin/generateReport.py
===================================================================
--- a/sitescripts/subscriptions/bin/generateReport.py
+++ b/sitescripts/subscriptions/bin/generateReport.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/bin/processTemplate.py
===================================================================
--- a/sitescripts/subscriptions/bin/processTemplate.py
+++ b/sitescripts/subscriptions/bin/processTemplate.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/bin/updateMalwareDomainsList.py
===================================================================
--- a/sitescripts/subscriptions/bin/updateMalwareDomainsList.py
+++ b/sitescripts/subscriptions/bin/updateMalwareDomainsList.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/bin/updateStatusPage.py
===================================================================
--- a/sitescripts/subscriptions/bin/updateStatusPage.py
+++ b/sitescripts/subscriptions/bin/updateStatusPage.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/bin/updateSubscriptionDownloads.py
===================================================================
--- a/sitescripts/subscriptions/bin/updateSubscriptionDownloads.py
+++ b/sitescripts/subscriptions/bin/updateSubscriptionDownloads.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/bin/updateSubscriptionDownloadsCVS.py
===================================================================
--- a/sitescripts/subscriptions/bin/updateSubscriptionDownloadsCVS.py
+++ b/sitescripts/subscriptions/bin/updateSubscriptionDownloadsCVS.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/combineSubscriptions.py
===================================================================
--- a/sitescripts/subscriptions/combineSubscriptions.py
+++ b/sitescripts/subscriptions/combineSubscriptions.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-# coding: utf-8
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
Index: sitescripts/subscriptions/knownIssuesParser.py
===================================================================
--- a/sitescripts/subscriptions/knownIssuesParser.py
+++ b/sitescripts/subscriptions/knownIssuesParser.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/subscriptionParser.py
===================================================================
--- a/sitescripts/subscriptions/subscriptionParser.py
+++ b/sitescripts/subscriptions/subscriptionParser.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/subscriptions/web/fallback.py
===================================================================
--- a/sitescripts/subscriptions/web/fallback.py
+++ b/sitescripts/subscriptions/web/fallback.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/templateFilters.py
===================================================================
--- a/sitescripts/templateFilters.py
+++ b/sitescripts/templateFilters.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
@@ -68,7 +66,7 @@
if parsed.scheme == 'http' or parsed.scheme == 'https':
url = Markup.escape(url)
title = Markup.escape(title)
- title = unicode(title).replace('*', '*').replace(u'…', u'…')
+ title = unicode(title).replace('*', '*').replace(u'\u2026', u'\u2026')
return Markup('%(title)s' % {'url': url, 'title': title})
else:
return url
Index: sitescripts/testpages/web/sitekey_frame.py
===================================================================
--- a/sitescripts/testpages/web/sitekey_frame.py
+++ b/sitescripts/testpages/web/sitekey_frame.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/urlfixer/bin/forceDomains.py
===================================================================
--- a/sitescripts/urlfixer/bin/forceDomains.py
+++ b/sitescripts/urlfixer/bin/forceDomains.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/urlfixer/bin/topDomains.py
===================================================================
--- a/sitescripts/urlfixer/bin/topDomains.py
+++ b/sitescripts/urlfixer/bin/topDomains.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/urlfixer/web/submitData.py
===================================================================
--- a/sitescripts/urlfixer/web/submitData.py
+++ b/sitescripts/urlfixer/web/submitData.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/utils.py
===================================================================
--- a/sitescripts/utils.py
+++ b/sitescripts/utils.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#
Index: sitescripts/web.py
===================================================================
--- a/sitescripts/web.py
+++ b/sitescripts/web.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
# This file is part of the Adblock Plus web scripts,
# Copyright (C) 2006-2016 Eyeo GmbH
#