Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Howdy,
Pending approval, I'm uploading a version of gcalcli which contains an upstream
patch to fix the reliance on the Google shortening service.
If a user invokes one of the subcommands with '--details url', the application
hits traceback issues as the service has been shut down.
See https://github.com/insanum/gcalcli/issues/440 for more details of the
problem.
The changelog reads:
gcalcli (4.0.4-2) unstable; urgency=medium
* d/p/remove_url_shortening.patch: Remove the deprecated goo.gl service.
-- Unit 193 Wed, 24 Apr 2019 19:46:16 -0400
And debdiff:
diff --git a/debian/changelog b/debian/changelog
index 868a5db..f6bd57b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcalcli (4.0.4-2) unstable; urgency=medium
+
+ * d/p/remove_url_shortening.patch: Remove the deprecated goo.gl service.
+
+ -- Unit 193 Wed, 24 Apr 2019 19:46:16 -0400
+
gcalcli (4.0.4-1) unstable; urgency=medium
* New upstream version 4.0.4
diff --git a/debian/patches/remove_url_shortening.patch
b/debian/patches/remove_url_shortening.patch
new file mode 100644
index 000..74a3c44
--- /dev/null
+++ b/debian/patches/remove_url_shortening.patch
@@ -0,0 +1,225 @@
+From 428378a88f89d154c8d4046deb9bdb5eb4e81019 Mon Sep 17 00:00:00 2001
+From: Joshua Crowgey
+Date: Mon, 15 Apr 2019 21:07:49 -0700
+Subject: [PATCH] Remove URL Shortening [fixes #440] (#443)
+
+Google has removed the urlshortening service. After some discussion,
+it was decided to remove the shortening facilities instead of trying to
+integrate with a separate provider. This makes our code simpler and
+folks who need url shortening can hopefully layer on what they need.
+---
+ ChangeLog|3 +++
+ gcalcli/argparsers.py| 16 +---
+ gcalcli/gcal.py | 39 +--
+ setup.py |2 +-
+ tests/test_argparsers.py |9 ++---
+ 5 files changed, 20 insertions(+), 49 deletions(-)
+
+Index: gcalcli/ChangeLog
+===
+--- gcalcli.orig/ChangeLog
gcalcli/ChangeLog
+@@ -1,3 +1,6 @@
++v4.1.0
++ * Removed url shortening due to Google deprecation #440
++
+ v4.0.4
+ * Minor bugfixes: conky colors, issues with setup.py
+
+Index: gcalcli/gcalcli/argparsers.py
+===
+--- gcalcli.orig/gcalcli/argparsers.py
gcalcli/gcalcli/argparsers.py
+@@ -7,11 +7,9 @@ from gcalcli.printer import valid_color_
+ from oauth2client import tools
+ import copy as _copy
+
+-DETAILS = ['all', 'calendar', 'location', 'length', 'reminders',
'description',
+- 'longurl', 'shorturl', 'url', 'attendees', 'email', 'attachments']
++DETAILS = ['calendar', 'location', 'length', 'reminders', 'description',
++ 'url', 'attendees', 'email', 'attachments']
+
+-BOOL_DETAILS = ['calendar', 'location', 'length', 'reminders', 'description',
+-'attendees', 'email', 'attachments']
+
+ PROGRAM_OPTIONS = {
+ '--client-id': {'default': gcalcli.__API_CLIENT_ID__,
+@@ -60,13 +58,9 @@ class DetailsAction(argparse._AppendActi
+ details = _copy.copy(getattr(namespace, self.dest, {}))
+
+ if value == 'all':
+-details = {d: True for d in BOOL_DETAILS}
+-elif value in BOOL_DETAILS:
++details = {d: True for d in DETAILS}
++else:
+ details[value] = True
+-elif value in ['shorturl', 'url']:
+-details['url'] = 'short'
+-elif value == 'longurl':
+-details['url'] = 'long'
+
+ setattr(namespace, self.dest, details)
+
+@@ -90,7 +84,7 @@ def get_details_parser():
+ details_parser = argparse.ArgumentParser(add_help=False)
+ details_parser.add_argument(
+ '--details', default={}, action=DetailsAction,
+-choices=DETAILS,
++choices=DETAILS + ['all'],
+ help='Which parts to display, can be: ' + ', '.join(DETAILS))
+ return details_parser
+
+Index: gcalcli/gcalcli/gcal.py
+===
+--- gcalcli.orig/gcalcli/gcal.py
gcalcli/gcalcli/gcal.py
+@@ -47,7 +47,6 @@ class GoogleCalendarInterface:
+ max_retries = 5
+ auth_http = None
+ cal_service = None
+-url_service = None
+
+ ACCESS_OWNER = 'owner'
+ ACCESS_WRITER = 'writer'
+@@ -140,8 +139,7 @@ class GoogleCalendarInterface:
+ OAuth2WebServerFlow(
+ client_id=self.options['client_id'],
+ client_secret=self.options['client_secret'],
+-scope=['https://www.googleapis.com/auth/calendar',
+-
'https://www.googleapis.com/auth/urlshortener'],
++
