diff --git a/apps/profile/tests.py b/apps/profile/tests.py index d1dd942d4..cfcf5610f 100644 --- a/apps/profile/tests.py +++ b/apps/profile/tests.py @@ -1,7 +1,7 @@ from utils import json_functions as json from django.test.client import Client from django.test import TestCase -from django.core.urlresolvers import reverse +from django.urls import reverse from django.conf import settings from mongoengine.connection import connect, disconnect diff --git a/apps/push/models.py b/apps/push/models.py index ac495e3bc..e6d77ed66 100644 --- a/apps/push/models.py +++ b/apps/push/models.py @@ -30,8 +30,7 @@ class PushSubscriptionManager(models.Manager): if lease_seconds is None: lease_seconds = getattr(settings, 'PUBSUBHUBBUB_LEASE_SECONDS', DEFAULT_LEASE_SECONDS) - - feed = Feed.get_by_id(feed.pk) + feed = Feed.get_by_id(feed.id) subscription, created = self.get_or_create(feed=feed) signals.pre_subscribe.send(sender=subscription, created=created) subscription.set_expiration(lease_seconds) diff --git a/apps/push/tests.py b/apps/push/tests.py index e45ec3b8d..b40648dbc 100644 --- a/apps/push/tests.py +++ b/apps/push/tests.py @@ -147,7 +147,7 @@ class PSHBSubscriptionManagerTest(PSHBTestBase, TestCase): self.responses.append(MockResponse(500, 'error data')) try: PushSubscription.objects.subscribe('topic', 'hub', 'callback') - except urllib.URLError as e: + except urllib.error.URLError as e: self.assertEquals(e.reason, 'error subscribing to topic on hub:\nerror data') else: diff --git a/apps/reader/managers.py b/apps/reader/managers.py index e4212d901..c808a4ad7 100644 --- a/apps/reader/managers.py +++ b/apps/reader/managers.py @@ -33,4 +33,4 @@ class UserSubscriptionManager(models.Manager): return super(UserSubscriptionManager, self).get(*args, **kwargs) else: exc_info = sys.exc_info() - raise exc_info[0].with_traceback(exc_info[2]) + raise exc_info[1]