This is why git rebase is a horrible horrible thing.

rtv/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: John Jenkins twodopeshaggy@gmail.com
 
 pkgname=rtv
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 pkgdesc="Browse Reddit from your terminal"
 arch=('any')
@@ -10,7 +10,7 @@ license=('MIT')
 makedepends=('git')
 depends=('ncurses' 'python' 'python-six' 'python-requests' 'python-praw' 'python-setuptools')
 source=(https://github.com/michael-lazar/rtv/archive/v$pkgver.tar.gz)
-md5sums=('10f2f66a289c04ef7c3522726b8f0823')
+md5sums=('ae2cea2fdec3657611db625751ae36f1')
 
 package() {
    cd "$srcdir/$pkgname-$pkgver"

rtv/pkg/rtv/.PKGINFO

@@ -1,13 +1,13 @@
 # Generated by makepkg 4.2.1
 # using fakeroot version 1.20.2
-# Mon Apr  6 10:19:20 UTC 2015
+# Wed Apr  8 02:46:48 UTC 2015
 pkgname = rtv
-pkgver = 1.2.1-1
+pkgver = 1.2.2-1
 pkgdesc = Browse Reddit from your terminal
 url = https://github.com/michael-lazar/rtv
-builddate = 1428315560
+builddate = 1428461208
 packager = Unknown Packager
-size = 230400
+size = 231424
 arch = any
 license = MIT
 depend = ncurses

rtv/pkg/rtv/usr/bin/rtv

@@ -1,10 +1,10 @@
 #!/bin/python
-# EASY-INSTALL-ENTRY-SCRIPT: 'rtv==1.2.1','console_scripts','rtv'
-__requires__ = 'rtv==1.2.1'
+# EASY-INSTALL-ENTRY-SCRIPT: 'rtv==1.2.2','console_scripts','rtv'
+__requires__ = 'rtv==1.2.2'
 import sys
 from pkg_resources import load_entry_point
 
 if __name__ == '__main__':
     sys.exit(
-        load_entry_point('rtv==1.2.1', 'console_scripts', 'rtv')()
+        load_entry_point('rtv==1.2.2', 'console_scripts', 'rtv')()
     )

rtv/pkg/rtv/usr/lib/python3.4/site-packages/rtv-1.2.1-py3.4.egg-info/PKG-INFO → rtv/pkg/rtv/usr/lib/python3.4/site-packages/rtv-1.2.2-py3.4.egg-info/PKG-INFO

@@ -1,40 +1,38 @@
 Metadata-Version: 1.1
 Name: rtv
-Version: 1.2.1
+Version: 1.2.2
 Summary: A simple terminal viewer for Reddit (Reddit Terminal Viewer)
 Home-page: https://github.com/michael-lazar/rtv
 Author: Michael Lazar
 Author-email: lazar.michael22@gmail.com
 License: MIT
-Description: .. image:: https://pypip.in/version/rtv/badge.svg?text=version&style=flat
-            :target: https://pypi.python.org/pypi/rtv/
-            :alt: Latest Version
-        
-        .. image:: https://pypip.in/py_versions/rtv/badge.svg?style=flat
-            :target: https://pypi.python.org/pypi/rtv/
-            :alt: Supported Python versions
+Description: 
+        ===========================
+        RTV: Reddit Terminal Viewer
+        ===========================
         
-        ======================
-        Reddit Terminal Viewer
-        ======================
-        
-        Browse Reddit from your terminal
+        RTV is an application that allows you to view and interact with reddit from your terminal. It is compatible with *most* terminal emulators on Linux and OSX.
         
         .. image:: http://i.imgur.com/W1hxqCt.png
         
-        RTV is built in **python** using the **curses** library, and is compatible with *most* terminal emulators on Linux and OS X.
+        RTV is built in **python** using the **curses** library.
+        
+        ---------------
         
-        -------------
-        Update (v1.1)
-        -------------
+        |pypi| |python| |downloads|
         
-        Users can now post comments!
+        ---------------
         
-        .. image:: http://i.imgur.com/twls7iM.png
+        * `Installation`_
+        * `Configuration`_
+        * `Usage`_
+        * `Changelog`_
+        * `Contributors`_
+        * `License`_
         
-        ------------
+        ============
         Installation
-        ------------
+        ============
         
         Install using pip
         
@@ -57,13 +55,53 @@ Description: .. image:: https://pypip.in/version/rtv/badge.svg?text=version&styl
            $ rtv
            $ rtv --help
         
-        -----
+        
+        =============
+        Configuration
+        =============
+        
+        RTV will read a configuration file located at ``$XDG_CONFIG_HOME/rtv/rtv.cfg`` or ``~/.config/rtv/rtv.cfg`` if ``$XDG_CONFIG_HOME`` is not set.
+        This can be used to avoid having to re-enter login credentials every time the program is launched.
+        Each line in the file will replace the corresponding default argument in the launch script.
+        
+        Example config:
+        
+        .. code-block:: ini
+        
+          [rtv]
+          username=MyUsername
+          password=MySecretPassword
+        
+          # Log file location
+          log=/tmp/rtv.log
+        
+          # Default subreddit
+          subreddit=CollegeBasketball
+        
+          # Default submission link - will be opened every time the program starts
+          # link=http://www.reddit.com/r/CollegeBasketball/comments/31irjq
+        
+          # Enable unicode characters (experimental)
+          # This is known to be unstable with east asian wide character sets
+          # unicode=true
+        
+        RTV allows users to compose comments and replys using their preferred text editor (**vi**, **nano**, **gedit**, etc).
+        Set the environment variable ``RTV_EDITOR`` to specify which editor the program should use.
+        
+        .. code-block:: bash
+        
+           $ export RTV_EDITOR=gedit
+        
+        
+        =====
         Usage 
-        -----
+        =====
         
         RTV currently supports browsing both subreddits and individual submissions. In each mode the controls are slightly different.
         
-        **Global Commands**
+        ---------------
+        Global Commands
+        ---------------
         
         :``▲``/``▼`` or ``j``/``k``: Scroll to the prev/next item
         :``a``/``z``: Upvote/downvote the selected item
@@ -73,7 +111,9 @@ Description: .. image:: https://pypip.in/version/rtv/badge.svg?text=version&styl
         :``?``: Show the help screen
         :``q``: Quit
         
-        **Subreddit Mode**
+        --------------
+        Subreddit Mode
+        --------------
         
         In subreddit mode you can browse through the top submissions on either the front page or a specific subreddit.
         
@@ -90,7 +130,9 @@ Description: .. image:: https://pypip.in/version/rtv/badge.svg?text=version&styl
         * ``/r/front`` will redirect to the front page
         * ``/r/me`` will display your submissions
         
-        **Submission Mode**
+        ---------------
+        Submission Mode
+        ---------------
         
         In submission mode you can view the self text for a submission and browse comments.
         
@@ -98,41 +140,36 @@ Description: .. image:: https://pypip.in/version/rtv/badge.svg?text=version&styl
         :``►`` or ``l``: Fold the selected comment, or load additional comments
         :``c``: Post a new comment on the selected item
         
-        -------------
-        Configuration
-        -------------
-        
-        RTV will read a configuration file located at ``$XDG_CONFIG_HOME/rtv/rtv.cfg`` or ``~/.config/rtv/rtv.cfg`` if ``$XDG_CONFIG_HOME`` is not set.
-        This can be used to avoid having to re-enter login credentials every time the program is launched.
-        Each line in the file will replace the corresponding default argument in the launch script.
-        
-        Example config:
         
-        .. code-block:: ini
-        
-          [rtv]
-          username=MyUsername
-          password=MySecretPassword
+        =========
+        Changelog
+        =========
+        Please see `CHANGELOG.rst <https://github.com/michael-lazar/rtv/blob/master/CHANGELOG.rst>`_.
         
-          # Log file location
-          log=/tmp/rtv.log
         
-          # Default subreddit
-          subreddit=CollegeBasketball
+        ============
+        Contributors
+        ============
+        Please see `CONTRIBUTORS.rst <https://github.com/michael-lazar/rtv/blob/master/CONTRIBUTORS.rst>`_.
         
-          # Default submission link - will be opened every time the program starts
-          # link=http://www.reddit.com/r/CollegeBasketball/comments/31irjq
         
-          # Enable unicode characters (experimental)
-          # This is known to be unstable with east asian wide character sets
-          # unicode=true
+        =======
+        License
+        =======
+        Please see `LICENSE <https://github.com/michael-lazar/rtv/blob/master/LICENSE>`_.
         
-        RTV allows users to compose comments and replys using their preferred text editor (**vi**, **nano**, **gedit**, etc).
-        Set the environment variable ``RTV_EDITOR`` to specify which editor the program should use.
         
-        .. code-block:: bash
+        .. |python| image:: https://pypip.in/py_versions/rtv/badge.svg?style=flat-square
+            :target: https://pypi.python.org/pypi/rtv/
+            :alt: Supported Python versions
         
-           $ export RTV_EDITOR=gedit
+        .. |pypi| image:: https://pypip.in/version/rtv/badge.svg?text=version&style=flat-square
+            :target: https://pypi.python.org/pypi/rtv/
+            :alt: Latest Version
+            
+        .. |downloads| image:: https://pypip.in/download/rtv/badge.svg?period=month&style=flat-square
+            :target: https://pypi.python.org/pypi/rtv/
+            :alt: Downloads
         
 Keywords: reddit terminal praw curses
 Platform: UNKNOWN

rtv/pkg/rtv/usr/lib/python3.4/site-packages/rtv-1.2.1-py3.4.egg-info/SOURCES.txt → rtv/pkg/rtv/usr/lib/python3.4/site-packages/rtv-1.2.2-py3.4.egg-info/SOURCES.txt

@@ -1,3 +1,6 @@
+CHANGELOG.rst
+CONTRIBUTORS.rst
+LICENSE
 MANIFEST.in
 README.rst
 setup.cfg

rtv/pkg/rtv/usr/lib/python3.4/site-packages/rtv/__main__.py

@@ -112,7 +112,8 @@ def main():
             if args.link:
                 page = SubmissionPage(stdscr, reddit, url=args.link)
                 page.loop()
-            page = SubredditPage(stdscr, reddit, args.subreddit)
+            subreddit = args.subreddit or 'front'
+            page = SubredditPage(stdscr, reddit, subreddit)
             page.loop()
     except praw.errors.InvalidUserPass:
         print('Invalid password for username: {}'.format(args.username))

rtv/pkg/rtv/usr/lib/python3.4/site-packages/rtv/__version__.py

@@ -1 +1 @@
-__version__ = '1.2.1'
+__version__ = '1.2.2'

rtv/pkg/rtv/usr/lib/python3.4/site-packages/rtv/submission.py

@@ -120,7 +120,7 @@ class SubmissionPage(BasePage):
                 data['object'].add_comment(comment_text)
             else:
                 data['object'].reply(comment_text)
-        except praw.errors.APIException:
+        except praw.errors.APIException as e:
             message = ['Error: {}'.format(e.error_type), e.message]
             show_notification(self.stdscr, message)
             _logger.exception(e)