Merge pull request #860 from praw-dev/remove_permalink

Remove permalink for PRAW3.

.travis.yml

@@ -1,6 +1,6 @@
 after_success: coveralls
 cache: pip
-install: pip install coveralls flake8 pydocstyle
+install: pip install coveralls
 language: python
 matrix:
   allow_failures:
@@ -14,6 +14,4 @@ python:
   - nightly
 sudo: false
 script:
-  - flake8 --exclude=docs
-  - pydocstyle praw
   - coverage run --source=praw setup.py test

CHANGES.rst

@@ -10,6 +10,12 @@ upstream changes.
 
 .. begin_changelog_body
 
+3.6.2 (2017-10-28)
+------------------
+
+* **[BUGFIX]** ``Comment.permalink`` is no longer a PRAW provided property as
+  Reddit as officially added it.
+
 3.6.1 (2017-01-09)
 ------------------
 

praw/__init__.py

@@ -52,7 +52,7 @@
 from warnings import warn_explicit
 
 
-__version__ = '3.6.1'
+__version__ = '3.6.2'
 
 
 class Config(object):  # pylint: disable=R0903

praw/objects.py

@@ -452,7 +452,9 @@ def refresh(self):
             other = Redditor(self.reddit_session, self._case_name, fetch=True,
                              uniq=unique)
         elif isinstance(self, Comment):
-            sub = Submission.from_url(self.reddit_session, self.permalink,
+            url = urljoin(self.reddit_session.config.api_url,
+                          getattr(self, 'permalink', self._fast_permalink))
+            sub = Submission.from_url(self.reddit_session, url,
                                       params={'uniq': unique})
             if sub.comments:
                 other = sub.comments[0]
@@ -673,11 +675,6 @@ def is_root(self):
         sub_prefix = self.reddit_session.config.by_object[Submission]
         return self.parent_id.startswith(sub_prefix)
 
-    @property
-    def permalink(self):
-        """Return a permalink to the comment."""
-        return urljoin(self.submission.permalink, self.id)
-
     @property
     def replies(self):
         """Return a list of the comment replies to this comment.

tests/cassettes/test__to_reddit_list_with_object.json

@@ -113,4 +113,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.1"
-}
+}

tests/cassettes/test_accept_moderator_invite_fail.json

@@ -5,7 +5,7 @@
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "passwd=1111&user=PyAPITestUser2&api_type=json"
+          "string": "passwd=111111&user=PyAPITestUser2&api_type=json"
         },
         "headers": {
           "Accept": [
@@ -191,4 +191,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.2"
-}
+}

tests/cassettes/test_add_and_remove_subreddit.json

@@ -5,7 +5,7 @@
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "passwd=1111&user=PyAPITestUser2&api_type=json"
+          "string": "passwd=111111&user=PyAPITestUser2&api_type=json"
         },
         "headers": {
           "Accept": [
@@ -583,4 +583,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.2"
-}
+}

tests/cassettes/test_add_comment.json

@@ -5,7 +5,7 @@
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "passwd=1111&user=PyAPITestUser2&api_type=json"
+          "string": "passwd=111111&user=PyAPITestUser2&api_type=json"
         },
         "headers": {
           "Accept": [
@@ -390,4 +390,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.2"
-}
+}

tests/cassettes/test_add_link_flair.json

@@ -5,7 +5,7 @@
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "passwd=1111&user=PyAPITestUser2&api_type=json"
+          "string": "passwd=111111&user=PyAPITestUser2&api_type=json"
         },
         "headers": {
           "Accept": [
@@ -487,4 +487,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.2"
-}
+}

tests/cassettes/test_add_link_flair_to_invalid_subreddit.json

@@ -5,7 +5,7 @@
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "passwd=1111&user=PyAPITestUser2&api_type=json"
+          "string": "passwd=111111&user=PyAPITestUser2&api_type=json"
         },
         "headers": {
           "Accept": [
@@ -388,4 +388,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.2"
-}
+}

tests/cassettes/test_add_link_template.json

@@ -5,7 +5,7 @@
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "passwd=1111&user=PyAPITestUser2&api_type=json"
+          "string": "passwd=111111&user=PyAPITestUser2&api_type=json"
         },
         "headers": {
           "Accept": [
@@ -571,4 +571,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.2"
-}
+}

tests/cassettes/test_add_moderator__failure.json

@@ -5,7 +5,7 @@
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "passwd=1111&user=PyAPITestUser2&api_type=json"
+          "string": "passwd=111111&user=PyAPITestUser2&api_type=json"
         },
         "headers": {
           "Accept": [
@@ -479,4 +479,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.2"
-}
+}

tests/cassettes/test_add_remove_friends.json

@@ -5,7 +5,7 @@
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "user=PyAPITestUser2&api_type=json&passwd=1111"
+          "string": "user=PyAPITestUser2&api_type=json&passwd=111111"
         },
         "headers": {
           "Accept": [
@@ -697,4 +697,4 @@
     }
   ],
   "recorded_with": "betamax/0.4.1"
-}
+}