v2.1.27-beta

Add Systemd auto restart policy

CHANGELOG.md

@@ -1,5 +1,65 @@
 # Changelog
 
+## v2.1.27-beta (2019-03-03)
+
+* Monitoring:
+  * Fix: Error when playing synced optimized versions.
+  * Change: Show message to complete the setup wizard instead of error communicating with server message.
+  * Change: URL changed on Plex.tv for Plex Media Server beta updates.
+* Notifications:
+  * New: Show the media type exclusion tags in the text preview modal.
+  * Fix: Unicode error in the Email notification failed response message.
+  * Fix: Error when a notification agent response is missing the "Content-Type" header.
+* UI:
+  * Fix: Usernames were not being sanitized in dropdown selectors.
+  * Change: Different display of "All" recently added items on the homepage due to change in the Plex Media Server v1.15+ API.
+* API:
+  * New: Added current Tautulli version to update_check API response.
+  * Change: API no longer returns sanitized HTML response data.
+* Other:
+  * New: Added auto-restart to systemd init script.
+  * Fix: Patreon donation URL.
+  * Remove: Crypto donation options.
+
+
+## v2.1.26 (2018-12-01)
+
+* Monitoring:
+  * Fix: Resume event not being triggered after buffering.
+* Notifications:
+  * New: Added user email as a notification parameter.
+* Graphs:
+  * Fix: History model showing no results for stream info graph.
+* API:
+  * Fix: API returning error when missing a cmd.
+
+
+## v2.1.25 (2018-11-03)
+
+* Monitoring:
+  * Fix: Audio and video codec showing up as * on the activity cards.
+  * New: Poster and background image on the activity cards for live TV.
+* UI:
+  * Fix: Alert message for invalid Tautulli Public Domain setting.
+
+
+## v2.1.24-beta (2018-10-29)
+
+* Monitoring:
+  * Fix: Transcode change events creating invalid sessions in the database.
+* Notifications:
+  * Change: Update Telegram character limit to 1024.
+* History:
+  * Fix: Save history table states separately for multiple Tautulli instances.
+* Graphs:
+  * Fix: Save graphs states separately for multiple Tautulli instances.
+  * Change: Version graphs to bypass browser cache.
+* UI:
+  * New: Added queued tasks modals to the scheduled tasks table for debugging.
+* Other:
+  * Change: Updated timezone info and display in configuration table.
+
+
 ## v2.1.23-beta (2018-10-14)
 
 * Monitoring:

Tautulli.py

@@ -28,9 +28,12 @@ import sys
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib'))
 
 import argparse
+import datetime
 import locale
+import pytz
 import signal
 import time
+import tzlocal
 
 import plexpy
 from plexpy import config, database, logger, webstart
@@ -106,6 +109,14 @@ def main():
     logger.initLogger(console=not plexpy.QUIET, log_dir=False,
                       verbose=plexpy.VERBOSE)
 
+    try:
+        plexpy.SYS_TIMEZONE = str(tzlocal.get_localzone())
+        plexpy.SYS_UTC_OFFSET = datetime.datetime.now(pytz.timezone(plexpy.SYS_TIMEZONE)).strftime('%z')
+    except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e:
+        logger.error("Could not determine system timezone: %s" % e)
+        plexpy.SYS_TIMEZONE = 'Unknown'
+        plexpy.SYS_UTC_OFFSET = '+0000'
+
     if os.getenv('TAUTULLI_DOCKER', False) == 'True':
         plexpy.DOCKER = True
 

data/interfaces/default/base.html

@@ -209,7 +209,7 @@ ${next.modalIncludes()}
     </div>
 </div>
 % else:
-<div id="donate-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="crypto-donate-modal">
+<div id="donate-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="donate-modal">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -230,17 +230,13 @@ ${next.modalIncludes()}
                 <ul id="donation_type" class="nav nav-pills" role="tablist" style="display: flex; justify-content: center; margin: 10px 0;">
                     <li class="active"><a href="#patreon-donation" role="tab" data-toggle="tab">Patreon</a></li>
                     <li><a href="#paypal-donation" role="tab" data-toggle="tab">PayPal</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="bitcoin" data-name="Bitcoin" data-address="3FdfJAyNWU15Sf11U9FTgPHuP1hPz32eEN">Bitcoin</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="bitcoincash" data-name="Bitcoin Cash" data-address="1H2atabxAQGaFAWYQEiLkXKSnK9CZZvt2n">Bitcoin Cash</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="ethereum" data-name="Ethereum" data-address="0x77ae4c2b8de1a1ccfa93553db39971da58c873d3">Ethereum</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" class="crypto-donation" data-coin="litecoin" data-name="Litecoin" data-address="LWpPmUqQYHBhMV83XSCsHzPmKLhJt6r57J">Litecoin</a></li>
                 </ul>
                 <div class="tab-content">
                     <div role="tabpanel" class="tab-pane active" id="patreon-donation" style="text-align: center">
                         <p>
                             Click the button below to continue to Patreon.
                         </p>
-                        <a href="${anon_url('https://www.patreon.com/bePatron?u=10078609')}" target="_blank">
+                        <a href="${anon_url('https://www.patreon.com/join/tautulli')}" target="_blank">
                             <img src="images/become_a_patron_button.png" alt="Become a Patron" height="40">
                         </a>
                     </div>
@@ -252,12 +248,6 @@ ${next.modalIncludes()}
                             <img src="images/gold-rect-paypal-34px.png" alt="PayPal">
                         </a>
                     </div>
-                    <div role="tabpanel" class="tab-pane" id="crypto-donation">
-                        <label>QR Code</label>
-                        <pre id="crypto_qr_code" style="text-align: center"></pre>
-                        <label><span id="crypto_type_label"></span> Address</label>
-                        <pre id="crypto_address" style="text-align: center"></pre>
-                    </div>
                 </div>
             </div>
             <div class="modal-footer">
@@ -293,7 +283,6 @@ ${next.modalIncludes()}
 <script src="${http_root}js/pnotify.custom.min.js"></script>
 <script src="${http_root}js/platform.min.js"></script>
 <script src="${http_root}js/script.js${cache_param}"></script>
-<script src="${http_root}js/jquery.qrcode.min.js"></script>
 <script src="${http_root}js/jquery.tripleclick.min.js"></script>
 % if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS:
 <script src="${http_root}js/ajaxNotifications.js"></script>
@@ -365,16 +354,6 @@ ${next.modalIncludes()}
         checkUpdate(function () { $('#nav-update').html('<i class="fa fa-fw fa-arrow-alt-circle-up"></i> Check for Updates'); });
     });
 
-    $('#donation_type a.crypto-donation').on('shown.bs.tab', function () {
-        var crypto_coin = $(this).data('coin');
-        var crypto_name = $(this).data('name');
-        var crypto_address = $(this).data('address')
-        $('#crypto_qr_code').empty().qrcode({
-            text: crypto_coin + ":" + crypto_address
-        });
-        $('#crypto_type_label').html(crypto_name);
-        $('#crypto_address').html(crypto_address);
-    });
     % endif
 
     $('.dropdown-toggle').click(function (e) {

data/interfaces/default/configuration_table.html

@@ -71,6 +71,10 @@ DOCUMENTATION :: END
             <td>Platform:</td>
             <td>${common.PLATFORM} ${common.PLATFORM_RELEASE} (${common.PLATFORM_VERSION + (' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else '')})</td>
         </tr>
+        <tr>
+            <td>System Timezone:</td>
+            <td>${plexpy.SYS_TIMEZONE} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)})
+        </tr>
         <tr>
             <td>Python Version:</td>
             <td>${sys.version}</td>

data/interfaces/default/css/tautulli.css

@@ -3367,6 +3367,34 @@ pre::-webkit-scrollbar-thumb {
 .notification-params tr:nth-child(even) td {
     background-color: rgba(255,255,255,0.010);
 }
+.activity-queue {
+    width: 100%;
+    margin-top: 10px;
+    background-color: #282828;
+}
+.activity-queue th {
+    padding-left: 10px;
+    height: 30px;
+}
+.activity-queue th:first-child {
+    width: 268px;
+}
+.activity-queue th:nth-child(2) {
+    width: 125px;
+}
+.activity-queue th:nth-child(3) {
+    width: 175px;
+}
+.activity-queue td {
+    height: 25px;
+    padding: 5px 10px;
+}
+.activity-queue tr:nth-child(odd) td {
+    background-color: rgba(255,255,255,0.035);
+}
+.activity-queue tr:nth-child(even) td {
+    background-color: rgba(255,255,255,0.010);
+}
 #days-selection label,
 #months-selection label {
     margin-bottom: 0;
@@ -4176,7 +4204,7 @@ a[data-tab-destination] {
     background: #cc7b19;
     text-align: center;
     font-weight: bold;
-    padding-top: 2px;
+    padding: 2px 10px;
     position: absolute;
     top: 0;
     z-index: 9999;

data/interfaces/default/current_activity_instance.html

@@ -80,7 +80,9 @@ DOCUMENTATION :: END
      data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
     <div class="dashboard-activity-container">
         <%
-            if data['channel_stream'] == 0:
+            if data['live'] == 1:
+                background_url = 'images/art-live.png'
+            elif data['channel_stream'] == 0:
                 background_url = 'pms_image_proxy?img=' + data['art'] + '&width=500&height=280&opacity=40&background=282828&blur=3&fallback=art&refresh=true'
             else:
                 if (data['art'] and data['art'].startswith('http')) or (data['thumb'] and data['thumb'].startswith('http')):
@@ -93,7 +95,9 @@ DOCUMENTATION :: END
                 % if data['media_type'] == 'track':
                 <div id="poster-${sk}-bg" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=300&opacity=60&background=282828&blur=3&fallback=cover&refresh=true);"></div>
                 % endif
-                % if data['channel_stream'] == 0:
+                % if data['live'] == 1:
+                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/poster-live.png);"></div>
+                % elif data['channel_stream'] == 0:
                     % if data['media_type'] == 'movie':
                     <a id="poster-url-${sk}" href="${href}" title="${data['title']}">
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
@@ -113,7 +117,7 @@ DOCUMENTATION :: END
                         <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['parent_thumb'] or data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
                         % endif
                     % else:
-                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/art.png);"></div>
+                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/poster.png);"></div>
                     % endif
                 % else:
                     % if data['channel_icon'].startswith('http'):

data/interfaces/default/graphs.html

@@ -305,17 +305,17 @@
         setLocalStorage(chart_key, JSON.stringify(chart_visibility));
     }
 </script>
-<script src="${http_root}js/graphs/plays_by_day.js"></script>
+<script src="${http_root}js/graphs/plays_by_day.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_dayofweek.js"></script>
+<script src="${http_root}js/graphs/plays_by_dayofweek.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_hourofday.js"></script>
+<script src="${http_root}js/graphs/plays_by_hourofday.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_platform.js"></script>
+<script src="${http_root}js/graphs/plays_by_platform.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_user.js"></script>
+<script src="${http_root}js/graphs/plays_by_user.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_stream_type.js"></script>
+<script src="${http_root}js/graphs/plays_by_stream_type.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_source_resolution.js"></script>
+<script src="${http_root}js/graphs/plays_by_source_resolution.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_stream_resolution.js"></script>
+<script src="${http_root}js/graphs/plays_by_stream_resolution.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_platform_by_stream_type.js"></script>
+<script src="${http_root}js/graphs/plays_by_platform_by_stream_type.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_user_by_stream_type.js"></script>
+<script src="${http_root}js/graphs/plays_by_user_by_stream_type.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_month.js"></script>
+<script src="${http_root}js/graphs/plays_by_month.js${cache_param}"></script>
 <script>
     $(document).ready(function () {
 

data/interfaces/default/history_table_modal.html

@@ -54,7 +54,7 @@
                     json_data: JSON.stringify(d),
                     user_id: "${data['user_id']}",
                     start_date: "${data['start_date']}",
-                    media_type: "${data.get('media_type')}",
+                    media_type: "${data.get('media_type') or 'all'}",
                     transcode_decision: "${data.get('transcode_decision')}"
                 };
             }

data/interfaces/default/index.html

@@ -27,6 +27,8 @@
                 <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i> Checking for activity...</div>
                 % elif config['pms_is_cloud']:
                 <div id="dashboard-no-activity" class="text-muted">Plex Cloud server is sleeping.</div>
+                % elif not config['first_run_complete']:
+                <div id="dashboard-no-activity" class="text-muted">The Tautulli setup wizard has not been completed. Please click <a href="welcome">here</a> to go to the setup wizard.</div>
                 % else:
                 <div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.
                     % if _session['user_group'] == 'admin':

data/interfaces/default/js/script.js

@@ -10,10 +10,24 @@ if (typeof platform !== 'undefined') {
 }
 
 if (['IE', 'Microsoft Edge', 'IE Mobile'].indexOf(p.name) > -1) {
-    $('body').prepend('<div id="browser-warning"><i class="fa fa-exclamation-circle"></i>&nbsp;' +
+    if (!getCookie('browserDismiss')) {
+        var $browser_warning = $('<div id="browser-warning">' +
+            '<i class="fa fa-exclamation-circle"></i>&nbsp;' +
             'Tautulli does not support Internet Explorer or Microsoft Edge! ' +
-        'Please use a different browser such as Chrome or Firefox.</div>');
+            'Please use a different browser such as Chrome or Firefox.' +
-    var offset = $('#browser-warning').height();
+            '<button type="button" class="close"><i class="fa fa-remove"></i></button>' +
+            '</div>');
+        $('body').prepend($browser_warning);
+        var offset = $browser_warning.height();
+        warningOffset(offset);
+
+        $browser_warning.one('click', 'button.close', function () {
+            $browser_warning.remove();
+            warningOffset(-offset);
+            setCookie('browserDismiss', 'true', 7);
+        });
+
+        function warningOffset(offset) {
             var navbar = $('.navbar-fixed-top');
             if (navbar.length) {
                 navbar.offset({top: navbar.offset().top + offset});
@@ -22,6 +36,8 @@ if (['IE', 'Microsoft Edge', 'IE Mobile'].indexOf(p.name) > -1) {
             if (container.length) {
                 container.offset({top: container.offset().top + offset});
             }
+        }
+    }
 }
 
 function initConfigCheckbox(elem, toggleElem, reverse) {
@@ -517,23 +533,26 @@ function PopupCenter(url, title, w, h) {
     return newWindow;
 }
 
-function setLocalStorage(key, value) {
+
+function setLocalStorage(key, value, path) {
+    if (path !== false) {
+        key = key + '_' + window.location.pathname;
+    }
     localStorage.setItem(key, value);
 }
-function getLocalStorage(key, default_value) {
+function getLocalStorage(key, default_value, path) {
+    if (path !== false) {
+        key = key + '_' + window.location.pathname;
+    }
     var value = localStorage.getItem(key);
     if (value !== null) {
         return value
     } else if (default_value !== undefined) {
-        setLocalStorage(key, default_value);
+        setLocalStorage(key, default_value, path);
         return default_value
     }
 }
 
-if (!getLocalStorage('Tautulli_ClientId')) {
-    setLocalStorage('Tautulli_ClientId', uuidv4());
-}
-
 function uuidv4() {
     return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, function(c) {
         var cryptoObj = window.crypto || window.msCrypto; // for IE 11
@@ -545,7 +564,7 @@ var x_plex_headers = {
     'Accept': 'application/json',
     'X-Plex-Product': 'Tautulli',
     'X-Plex-Version': 'Plex OAuth',
-    'X-Plex-Client-Identifier': localStorage.getItem('Tautulli_ClientId'),
+    'X-Plex-Client-Identifier': getLocalStorage('Tautulli_ClientID', uuidv4(), false),
     'X-Plex-Platform': p.name,
     'X-Plex-Platform-Version': p.version,
     'X-Plex-Device': p.os,

data/interfaces/default/notifier_text_preview.html

@@ -8,7 +8,12 @@
             % if text:
             % for item in text:
             <div style="padding-bottom: 10px;">
-                <h4>${item['media_type'].capitalize()}</h4>
+                <h4>
+                    ${item['media_type'].capitalize()}
+                    % if item['media_type'] != 'server':
+                    <span class="inline-pre">&lt;${item['media_type']}&gt;&lt;/${item['media_type']}&gt;</span> tags
+                    % endif
+                </h4>
                 % if agent != 'webhook':
                 <pre>${item['subject']}</pre>
                 % endif

data/interfaces/default/queue_modal.html

@@ -0,0 +1,66 @@
+<%
+    import arrow
+    from plexpy.activity_handler import ACTIVITY_SCHED, schedule_callback
+
+    if queue == 'active sessions':
+        filter_key = 'session_key-'
+        title_format = '{2} / {1} ({0})'
+        title_key = title_format.format('Session Key', 'Title', 'User')
+        description = 'Queue to flush stuck active sessions to the database.'
+    else:
+        filter_key = 'rating_key-'
+        title_format = '{1} ({0})'
+        title_key = title_format.format('Rating Key', 'Title')
+        description  = 'Queue to flush recently added items to the database and send notifications if enabled.'
+
+    scheduled_jobs = [j.id for j in ACTIVITY_SCHED.get_jobs() if j.id.startswith(filter_key)]
+%>
+<div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+            <h4 class="modal-title">${queue.title()} Queue</h4>
+        </div>
+        <div class="modal-body">
+            <p class="help-block">
+                ${description}
+            </p>
+            <table class="activity-queue">
+                <thead>
+                    <tr>
+                        <th>
+                            ${title_key}
+                        </th>
+                        <th>
+                            Next Flush In
+                        </th>
+                        <th>
+                            Next Flush Time
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    % if scheduled_jobs:
+                    % for job in scheduled_jobs:
+                    <%
+                        sched_job = ACTIVITY_SCHED.get_job(job)
+                        next_run_in = arrow.get(sched_job.next_run_time).timestamp - arrow.now().timestamp
+                    %>
+                    <tr>
+                        <td><strong>${title_format.format(*sched_job.args)}</strong></td>
+                        <td>${arrow.get(next_run_in).format('HH:mm:ss')}</td>
+                        <td>${arrow.get(sched_job.next_run_time).format('YYYY-MM-DD HH:mm:ss')}</td>
+                    </tr>
+                    % endfor
+                    % else:
+                    <tr>
+                        <td colspan="3" style="text-align: center;"><i class="fa fa-check"></i>&nbsp; Nothing in the ${queue} queue</td>
+                    </tr>
+                    % endif
+                </tbody>
+            </table>
+        </div>
+        <div class="modal-footer">
+        </div>
+    </div>
+</div>

data/interfaces/default/scheduler_table.html

@@ -44,7 +44,13 @@ DOCUMENTATION :: END
         </tr>
         % elif job in ('Check for server response', 'Check for active sessions', 'Check for recently added items') and plexpy.WS_CONNECTED:
         <tr>
+            % if job == 'Check for active sessions':
+            <td><a class="queue-modal-link" href="#" data-queue="active sessions">${job}</a></td>
+            % elif job == 'Check for recently added items':
+            <td><a class="queue-modal-link" href="#" data-queue="recently added">${job}</a></td>
+            % else:
             <td>${job}</td>
+            % endif
             <td><i class="fa fa-sm fa-fw fa-check"></i> Websocket</td>
             <td>N/A</td>
             <td>N/A</td>
@@ -62,3 +68,20 @@ DOCUMENTATION :: END
         % endfor
     </tbody>
 </table>
+<script>
+    $('.queue-modal-link').on('click', function (e) {
+        e.preventDefault();
+        $.ajax({
+            url: 'get_queue_modal',
+            data: {
+                queue: $(this).data('queue')
+            },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#queue-modal").html(xhr.responseText);
+                $('#queue-modal').modal();
+            }
+        });
+    });
+</script>

data/interfaces/default/settings.html

@@ -472,7 +472,7 @@
                                 <div class="col-md-8">
                                     <input type="text" class="form-control" id="http_base_url" name="http_base_url" value="${config['http_base_url']}" placeholder="http://mydomain.com" data-parsley-trigger="change" data-parsley-pattern="^https?:\/\/\S+$" data-parsley-errors-container="#http_base_url_error"  data-parsley-error-message="Invalid URL">
                                 </div>
-                                <div id=http_base_url_error" class="alert alert-danger settings-alert" role="alert"></div>
+                                <div id="http_base_url_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
                             <p class="help-block">
                                 Set your public Tautulli domain for self-hosted notification images and newsletters. (e.g. http://mydomain.com)
@@ -1316,6 +1316,7 @@
 </%def>
 
 <%def name="modalIncludes()">
+<div id="queue-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="queue-modal"></div>
 <div id="guidelines-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="guidelines-modal">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
@@ -1531,7 +1532,7 @@
                     <div style="padding-bottom: 10px;">
                         <p class="help-block">
                             All text inside <span class="inline-pre">&lt;show&gt;&lt;/show&gt;</span>/<span class="inline-pre">&lt;season&gt;&lt;/season&gt;</span>/<span class="inline-pre">&lt;episode&gt;&lt;/episode&gt;</span>
-                            tags will only be sent when the media type is show/season/episode.
+                            tags will only be sent when the media type is show, season, or episode, respectively.
                         </p>
                         <p><strong style="color: #fff;">Example:</strong></p>
                         <pre>{show_name}&lt;season&gt; - Season {season_num}&lt;/season&gt;&lt;episode&gt; - S{season_num}E{episode_num} - {episode_name}&lt;/episode&gt; was recently added to Plex.</pre>
@@ -1542,7 +1543,7 @@
                     <div>
                         <p class="help-block">
                             All text inside <span class="inline-pre">&lt;artist&gt;&lt;/artist&gt;</span>/<span class="inline-pre">&lt;album&gt;&lt;/album&gt;</span>/<span class="inline-pre">&lt;track&gt;&lt;/track&gt;</span>
-                            tags will only be sent when the media type is artist/album/track.
+                            tags will only be sent when the media type is artist, album, or track, respectively.
                         </p>
                         <p><strong style="color: #fff;">Example:</strong></p>
                         <pre>{artist_name}&lt;album&gt; - {album_name}&lt;/album&gt;&lt;track&gt; - {album_name} - {track_name}&lt;/track&gt; was recently added to Plex.</pre>
@@ -2529,8 +2530,10 @@ $(document).ready(function() {
                     .prop('selected', selected));
             }
 
+            var download_url = 'https://plex.tv/api/downloads/' + (plex_update_channel === 'plexpass' ? '5' : '1') + '.json?channel=' + plex_update_channel;
+
             $.ajax({
-                url: 'https://plex.tv/api/downloads/1.json?channel=' + plex_update_channel,
+                url: download_url,
                 type: 'GET',
                 dataType: 'json',
                 beforeSend: function (xhr) {

data/interfaces/default/stream_data.html

@@ -230,7 +230,7 @@ DOCUMENTATION :: END
                 <tbody>
                     <tr>
                         <td>Codec</td>
-                        <td>${data['stream_subtitle_codec'].upper()}</td>
+                        <td>${data['stream_subtitle_codec'].upper() or '-'}</td>
                         <td>${data['subtitle_codec'].upper()}</td>
                     </tr>
                 </tbody>

init-scripts/init.systemd

@@ -53,6 +53,10 @@ GuessMainPID=no
 Type=forking
 User=tautulli
 Group=tautulli
+Restart=on-abnormal
+RestartSec=5
+StartLimitInterval=90
+StartLimitBurst=3
 
 [Install]
 WantedBy=multi-user.target

lib/pytz/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2009 Stuart Bishop <stuart@stuartbishop.net>
+Copyright (c) 2003-2018 Stuart Bishop <stuart@stuartbishop.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

lib/pytz/README.txt

@@ -87,13 +87,13 @@ localized time using the standard ``astimezone()`` method:
 Unfortunately using the tzinfo argument of the standard datetime
 constructors ''does not work'' with pytz for many timezones.
 
->>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=amsterdam).strftime(fmt)
+>>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=amsterdam).strftime(fmt)  # /!\ Does not work this way!
 '2002-10-27 12:00:00 LMT+0020'
 
 It is safe for timezones without daylight saving transitions though, such
 as UTC:
 
->>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=pytz.utc).strftime(fmt)
+>>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=pytz.utc).strftime(fmt)  # /!\ Not recommended except for UTC
 '2002-10-27 12:00:00 UTC+0000'
 
 The preferred way of dealing with times is to always work in UTC,
@@ -134,19 +134,21 @@ section for more details)
 >>> dt2.strftime(fmt)
 '2002-10-27 01:30:00 EST-0500'
 
-Converting between timezones also needs special attention. We also need
+Converting between timezones is more easily done, using the
-to use the ``normalize()`` method to ensure the conversion is correct.
+standard astimezone method.
 
 >>> utc_dt = utc.localize(datetime.utcfromtimestamp(1143408899))
 >>> utc_dt.strftime(fmt)
 '2006-03-26 21:34:59 UTC+0000'
 >>> au_tz = timezone('Australia/Sydney')
->>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz))
+>>> au_dt = utc_dt.astimezone(au_tz)
 >>> au_dt.strftime(fmt)
 '2006-03-27 08:34:59 AEDT+1100'
->>> utc_dt2 = utc.normalize(au_dt.astimezone(utc))
+>>> utc_dt2 = au_dt.astimezone(utc)
 >>> utc_dt2.strftime(fmt)
 '2006-03-26 21:34:59 UTC+0000'
+>>> utc_dt == utc_dt2
+True
 
 You can take shortcuts when dealing with the UTC side of timezone
 conversions. ``normalize()`` and ``localize()`` are not really
@@ -178,7 +180,7 @@ parameter to the ``utcoffset()``, ``dst()`` && ``tzname()`` methods.
 >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
 The ``is_dst`` parameter is ignored for most timestamps. It is only used
-during DST transition ambiguous periods to resulve that ambiguity.
+during DST transition ambiguous periods to resolve that ambiguity.
 
 >>> tz.utcoffset(normal, is_dst=True)
 datetime.timedelta(-1, 77400)
@@ -472,9 +474,9 @@ True
 True
 >>> 'Canada/Eastern' in common_timezones
 True
->>> 'US/Pacific-New' in all_timezones
+>>> 'Australia/Yancowinna' in all_timezones
 True
->>> 'US/Pacific-New' in common_timezones
+>>> 'Australia/Yancowinna' in common_timezones
 False
 
 Both ``common_timezones`` and ``all_timezones`` are alphabetically
@@ -510,6 +512,15 @@ Europe/Zurich
 Europe/Zurich
 
 
+Internationalization - i18n/l10n
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Pytz is an interface to the IANA database, which uses ASCII names. The `Unicode  Consortium's Unicode Locales (CLDR) <http://cldr.unicode.org>`_
+project provides translations. Thomas Khyn's
+`l18n <https://pypi.org/project/l18n/>`_ package can be used to access
+these translations from Python.
+
+
 License
 ~~~~~~~
 
@@ -527,12 +538,13 @@ Latest Versions
 
 This package will be updated after releases of the Olson timezone
 database.  The latest version can be downloaded from the `Python Package
-Index <http://pypi.python.org/pypi/pytz/>`_.  The code that is used
+Index <https://pypi.org/project/pytz/>`_.  The code that is used
 to generate this distribution is hosted on launchpad.net and available
-using the `Bazaar version control system <http://bazaar-vcs.org>`_
+using git::
-using::
 
-    bzr branch lp:pytz
+    git clone https://git.launchpad.net/pytz
+
+A mirror on github is also available at https://github.com/stub42/pytz
 
 Announcements of new releases are made on
 `Launchpad <https://launchpad.net/pytz>`_, and the
@@ -543,7 +555,7 @@ hosted there.
 Bugs, Feature Requests & Patches
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Bugs can be reported using `Launchpad <https://bugs.launchpad.net/pytz>`_.
+Bugs can be reported using `Launchpad <https://bugs.launchpad.net/pytz>`__.
 
 
 Issues & Limitations

lib/pytz/__init__.py

@@ -8,9 +8,22 @@ See the datetime section of the Python Library Reference for information
 on how to use these modules.
 '''
 
+import sys
+import datetime
+import os.path
+
+from pytz.exceptions import AmbiguousTimeError
+from pytz.exceptions import InvalidTimeError
+from pytz.exceptions import NonExistentTimeError
+from pytz.exceptions import UnknownTimeZoneError
+from pytz.lazy import LazyDict, LazyList, LazySet
+from pytz.tzinfo import unpickler, BaseTzInfo
+from pytz.tzfile import build_tzinfo
+
+
 # The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2016f'
+OLSON_VERSION = '2018f'
-VERSION = '2016.6.1'  # Switching to pip compatible version numbering.
+VERSION = '2018.6'  # pip compatible version number.
 __version__ = VERSION
 
 OLSEN_VERSION = OLSON_VERSION  # Old releases had this misspelling
@@ -21,23 +34,11 @@ __all__ = [
     'NonExistentTimeError', 'UnknownTimeZoneError',
     'all_timezones', 'all_timezones_set',
     'common_timezones', 'common_timezones_set',
-    ]
+    'BaseTzInfo',
-
+]
-import sys, datetime, os.path, gettext
-
-from pytz.exceptions import AmbiguousTimeError
-from pytz.exceptions import InvalidTimeError
-from pytz.exceptions import NonExistentTimeError
-from pytz.exceptions import UnknownTimeZoneError
-from pytz.lazy import LazyDict, LazyList, LazySet
-from pytz.tzinfo import unpickler
-from pytz.tzfile import build_tzinfo, _byte_string
 
 
-try:
+if sys.version_info[0] > 2:  # Python 3.x
-    unicode
-
-except NameError: # Python 3.x
 
     # Python 3.x doesn't have unicode(), making writing code
     # for Python 2.3 and Python 3.x a pain.
@@ -52,8 +53,11 @@ except NameError: # Python 3.x
             ...
         UnicodeEncodeError: ...
         """
+        if type(s) == bytes:
+            s = s.decode('ASCII')
+        else:
             s.encode('ASCII')  # Raise an exception if not ASCII
-        return s # But return the original string - not a byte string.
+        return s  # But the string - not a byte string.
 
 else:  # Python 2.x
 
@@ -76,11 +80,18 @@ def open_resource(name):
 
     Uses the pkg_resources module if available and no standard file
     found at the calculated location.
+
+    It is possible to specify different location for zoneinfo
+    subdir by using the PYTZ_TZDATADIR environment variable.
     """
     name_parts = name.lstrip('/').split('/')
     for part in name_parts:
         if part == os.path.pardir or os.path.sep in part:
             raise ValueError('Bad path segment: %r' % part)
+    zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', None)
+    if zoneinfo_dir is not None:
+        filename = os.path.join(zoneinfo_dir, *name_parts)
+    else:
         filename = os.path.join(os.path.dirname(__file__),
                                 'zoneinfo', *name_parts)
         if not os.path.exists(filename):
@@ -106,23 +117,9 @@ def resource_exists(name):
         return False
 
 
-# Enable this when we get some translations?
-# We want an i18n API that is useful to programs using Python's gettext
-# module, as well as the Zope3 i18n package. Perhaps we should just provide
-# the POT file and translations, and leave it up to callers to make use
-# of them.
-#
-# t = gettext.translation(
-#         'pytz', os.path.join(os.path.dirname(__file__), 'locales'),
-#         fallback=True
-#         )
-# def _(timezone_name):
-#     """Translate a timezone name using the current locale, returning Unicode"""
-#     return t.ugettext(timezone_name)
-
-
 _tzinfo_cache = {}
 
+
 def timezone(zone):
     r''' Return a datetime.tzinfo implementation for the given timezone
 
@@ -192,7 +189,7 @@ ZERO = datetime.timedelta(0)
 HOUR = datetime.timedelta(hours=1)
 
 
-class UTC(datetime.tzinfo):
+class UTC(BaseTzInfo):
     """UTC
 
     Optimized UTC implementation. It unpickles using the single module global
@@ -288,7 +285,6 @@ def _p(*args):
 _p.__safe_for_unpickling__ = True
 
 
-
 class _CountryTimezoneDict(LazyDict):
     """Map ISO 3166 country code to a list of timezone names commonly used
     in that country.
@@ -412,24 +408,24 @@ class _FixedOffset(datetime.tzinfo):
         return dt.astimezone(self)
 
 
-def FixedOffset(offset, _tzinfos = {}):
+def FixedOffset(offset, _tzinfos={}):
     """return a fixed-offset timezone based off a number of minutes.
 
         >>> one = FixedOffset(-330)
         >>> one
         pytz.FixedOffset(-330)
-        >>> one.utcoffset(datetime.datetime.now())
+        >>> str(one.utcoffset(datetime.datetime.now()))
-        datetime.timedelta(-1, 66600)
+        '-1 day, 18:30:00'
-        >>> one.dst(datetime.datetime.now())
+        >>> str(one.dst(datetime.datetime.now()))
-        datetime.timedelta(0)
+        '0:00:00'
 
         >>> two = FixedOffset(1380)
         >>> two
         pytz.FixedOffset(1380)
-        >>> two.utcoffset(datetime.datetime.now())
+        >>> str(two.utcoffset(datetime.datetime.now()))
-        datetime.timedelta(0, 82800)
+        '23:00:00'
-        >>> two.dst(datetime.datetime.now())
+        >>> str(two.dst(datetime.datetime.now()))
-        datetime.timedelta(0)
+        '0:00:00'
 
     The datetime.timedelta must be between the range of -1 and 1 day,
     non-inclusive.
@@ -482,14 +478,13 @@ FixedOffset.__safe_for_unpickling__ = True
 
 
 def _test():
-    import doctest, os, sys
+    import doctest
     sys.path.insert(0, os.pardir)
     import pytz
     return doctest.testmod(pytz)
 
 if __name__ == '__main__':
     _test()
-
 all_timezones = \
 ['Africa/Abidjan',
  'Africa/Accra',
@@ -676,6 +671,7 @@ all_timezones = \
  'America/Porto_Acre',
  'America/Porto_Velho',
  'America/Puerto_Rico',
+ 'America/Punta_Arenas',
  'America/Rainy_River',
  'America/Rankin_Inlet',
  'America/Recife',
@@ -731,6 +727,7 @@ all_timezones = \
  'Asia/Aqtobe',
  'Asia/Ashgabat',
  'Asia/Ashkhabad',
+ 'Asia/Atyrau',
  'Asia/Baghdad',
  'Asia/Bahrain',
  'Asia/Baku',
@@ -751,6 +748,7 @@ all_timezones = \
  'Asia/Dili',
  'Asia/Dubai',
  'Asia/Dushanbe',
+ 'Asia/Famagusta',
  'Asia/Gaza',
  'Asia/Harbin',
  'Asia/Hebron',
@@ -816,6 +814,7 @@ all_timezones = \
  'Asia/Vientiane',
  'Asia/Vladivostok',
  'Asia/Yakutsk',
+ 'Asia/Yangon',
  'Asia/Yekaterinburg',
  'Asia/Yerevan',
  'Atlantic/Azores',
@@ -861,7 +860,6 @@ all_timezones = \
  'CST6CDT',
  'Canada/Atlantic',
  'Canada/Central',
- 'Canada/East-Saskatchewan',
  'Canada/Eastern',
  'Canada/Mountain',
  'Canada/Newfoundland',
@@ -955,6 +953,7 @@ all_timezones = \
  'Europe/Samara',
  'Europe/San_Marino',
  'Europe/Sarajevo',
+ 'Europe/Saratov',
  'Europe/Simferopol',
  'Europe/Skopje',
  'Europe/Sofia',
@@ -1072,7 +1071,6 @@ all_timezones = \
  'US/Michigan',
  'US/Mountain',
  'US/Pacific',
- 'US/Pacific-New',
  'US/Samoa',
  'UTC',
  'Universal',
@@ -1252,6 +1250,7 @@ common_timezones = \
  'America/Port_of_Spain',
  'America/Porto_Velho',
  'America/Puerto_Rico',
+ 'America/Punta_Arenas',
  'America/Rainy_River',
  'America/Rankin_Inlet',
  'America/Recife',
@@ -1301,6 +1300,7 @@ common_timezones = \
  'Asia/Aqtau',
  'Asia/Aqtobe',
  'Asia/Ashgabat',
+ 'Asia/Atyrau',
  'Asia/Baghdad',
  'Asia/Bahrain',
  'Asia/Baku',
@@ -1317,6 +1317,7 @@ common_timezones = \
  'Asia/Dili',
  'Asia/Dubai',
  'Asia/Dushanbe',
+ 'Asia/Famagusta',
  'Asia/Gaza',
  'Asia/Hebron',
  'Asia/Ho_Chi_Minh',
@@ -1351,7 +1352,6 @@ common_timezones = \
  'Asia/Pyongyang',
  'Asia/Qatar',
  'Asia/Qyzylorda',
- 'Asia/Rangoon',
  'Asia/Riyadh',
  'Asia/Sakhalin',
  'Asia/Samarkand',
@@ -1372,6 +1372,7 @@ common_timezones = \
  'Asia/Vientiane',
  'Asia/Vladivostok',
  'Asia/Yakutsk',
+ 'Asia/Yangon',
  'Asia/Yekaterinburg',
  'Asia/Yerevan',
  'Atlantic/Azores',
@@ -1444,6 +1445,7 @@ common_timezones = \
  'Europe/Samara',
  'Europe/San_Marino',
  'Europe/Sarajevo',
+ 'Europe/Saratov',
  'Europe/Simferopol',
  'Europe/Skopje',
  'Europe/Sofia',
@@ -1489,7 +1491,6 @@ common_timezones = \
  'Pacific/Guadalcanal',
  'Pacific/Guam',
  'Pacific/Honolulu',
- 'Pacific/Johnston',
  'Pacific/Kiritimati',
  'Pacific/Kosrae',
  'Pacific/Kwajalein',

lib/pytz/exceptions.py

@@ -5,7 +5,7 @@ Custom exceptions raised by pytz.
 __all__ = [
     'UnknownTimeZoneError', 'InvalidTimeError', 'AmbiguousTimeError',
     'NonExistentTimeError',
-    ]
+]
 
 
 class UnknownTimeZoneError(KeyError):

lib/pytz/lazy.py

@@ -1,7 +1,10 @@
 from threading import RLock
 try:
-    from UserDict import DictMixin
+    from collections.abc import Mapping as DictMixin
-except ImportError:
+except ImportError:  # Python < 3.3
+    try:
+        from UserDict import DictMixin  # Python 2
+    except ImportError:  # Python 3.0-3.3
         from collections import Mapping as DictMixin
 
 
@@ -13,6 +16,7 @@ _fill_lock = RLock()
 class LazyDict(DictMixin):
     """Dictionary populated on first use."""
     data = None
+
     def __getitem__(self, key):
         if self.data is None:
             _fill_lock.acquire()

lib/pytz/reference.py

@@ -5,17 +5,28 @@ Used for testing against as they are only correct for the years
 '''
 
 from datetime import tzinfo, timedelta, datetime
-from pytz import utc, UTC, HOUR, ZERO
+from pytz import HOUR, ZERO, UTC
+
+__all__ = [
+    'FixedOffset',
+    'LocalTimezone',
+    'USTimeZone',
+    'Eastern',
+    'Central',
+    'Mountain',
+    'Pacific',
+    'UTC'
+]
+
 
 # A class building tzinfo objects for fixed-offset time zones.
 # Note that FixedOffset(0, "UTC") is a different way to build a
 # UTC tzinfo object.
-
 class FixedOffset(tzinfo):
     """Fixed offset in minutes east from UTC."""
 
     def __init__(self, offset, name):
-        self.__offset = timedelta(minutes = offset)
+        self.__offset = timedelta(minutes=offset)
         self.__name = name
 
     def utcoffset(self, dt):
@@ -27,18 +38,19 @@ class FixedOffset(tzinfo):
     def dst(self, dt):
         return ZERO
 
-# A class capturing the platform's idea of local time.
 
 import time as _time
 
-STDOFFSET = timedelta(seconds = -_time.timezone)
+STDOFFSET = timedelta(seconds=-_time.timezone)
 if _time.daylight:
-    DSTOFFSET = timedelta(seconds = -_time.altzone)
+    DSTOFFSET = timedelta(seconds=-_time.altzone)
 else:
     DSTOFFSET = STDOFFSET
 
 DSTDIFF = DSTOFFSET - STDOFFSET
 
+
+# A class capturing the platform's idea of local time.
 class LocalTimezone(tzinfo):
 
     def utcoffset(self, dt):
@@ -66,7 +78,6 @@ class LocalTimezone(tzinfo):
 
 Local = LocalTimezone()
 
-# A complete implementation of current DST rules for major US time zones.
 
 def first_sunday_on_or_after(dt):
     days_to_go = 6 - dt.weekday()
@@ -74,12 +85,15 @@ def first_sunday_on_or_after(dt):
         dt += timedelta(days_to_go)
     return dt
 
+
 # In the US, DST starts at 2am (standard time) on the first Sunday in April.
 DSTSTART = datetime(1, 4, 1, 2)
 # and ends at 2am (DST time; 1am standard time) on the last Sunday of Oct.
 # which is the first Sunday on or after Oct 25.
 DSTEND = datetime(1, 10, 25, 1)
 
+
+# A complete implementation of current DST rules for major US time zones.
 class USTimeZone(tzinfo):
 
     def __init__(self, hours, reprname, stdname, dstname):
@@ -124,4 +138,3 @@ Eastern  = USTimeZone(-5, "Eastern",  "EST", "EDT")
 Central = USTimeZone(-6, "Central", "CST", "CDT")
 Mountain = USTimeZone(-7, "Mountain", "MST", "MDT")
 Pacific = USTimeZone(-8, "Pacific", "PST", "PDT")
-

lib/pytz/tzfile.py

@@ -3,30 +3,29 @@
 $Id: tzfile.py,v 1.8 2004/06/03 00:15:24 zenzen Exp $
 '''
 
-try:
+from datetime import datetime
-    from cStringIO import StringIO
-except ImportError:
-    from io import StringIO
-from datetime import datetime, timedelta
 from struct import unpack, calcsize
 
 from pytz.tzinfo import StaticTzInfo, DstTzInfo, memorized_ttinfo
 from pytz.tzinfo import memorized_datetime, memorized_timedelta
 
+
 def _byte_string(s):
     """Cast a string or byte string to an ASCII byte string."""
     return s.encode('ASCII')
 
 _NULL = _byte_string('\0')
 
+
 def _std_string(s):
     """Cast a string or byte string to an ASCII string."""
     return str(s.decode('ASCII'))
 
+
 def build_tzinfo(zone, fp):
     head_fmt = '>4s c 15x 6l'
     head_size = calcsize(head_fmt)
-    (magic, format, ttisgmtcnt, ttisstdcnt,leapcnt, timecnt,
+    (magic, format, ttisgmtcnt, ttisstdcnt, leapcnt, timecnt,
         typecnt, charcnt) = unpack(head_fmt, fp.read(head_size))
 
     # Make sure it is a tzfile(5) file
@@ -34,7 +33,7 @@ def build_tzinfo(zone, fp):
 
     # Read out the transition times, localtime indices and ttinfo structures.
     data_fmt = '>%(timecnt)dl %(timecnt)dB %(ttinfo)s %(charcnt)ds' % dict(
-        timecnt=timecnt, ttinfo='lBB'*typecnt, charcnt=charcnt)
+        timecnt=timecnt, ttinfo='lBB' * typecnt, charcnt=charcnt)
     data_size = calcsize(data_fmt)
     data = unpack(data_fmt, fp.read(data_size))
 
@@ -53,7 +52,7 @@ def build_tzinfo(zone, fp):
     i = 0
     while i < len(ttinfo_raw):
         # have we looked up this timezone name yet?
-        tzname_offset = ttinfo_raw[i+2]
+        tzname_offset = ttinfo_raw[i + 2]
         if tzname_offset not in tznames:
             nul = tznames_raw.find(_NULL, tzname_offset)
             if nul < 0:
@@ -61,12 +60,12 @@ def build_tzinfo(zone, fp):
             tznames[tzname_offset] = _std_string(
                 tznames_raw[tzname_offset:nul])
         ttinfo.append((ttinfo_raw[i],
-                       bool(ttinfo_raw[i+1]),
+                       bool(ttinfo_raw[i + 1]),
                        tznames[tzname_offset]))
         i += 3
 
     # Now build the timezone object
-    if len(ttinfo) ==1 or len(transitions) == 0:
+    if len(ttinfo) == 1 or len(transitions) == 0:
         ttinfo[0][0], ttinfo[0][2]
         cls = type(zone, (StaticTzInfo,), dict(
             zone=zone,
@@ -91,7 +90,7 @@ def build_tzinfo(zone, fp):
             if not inf[1]:
                 dst = 0
             else:
-                for j in range(i-1, -1, -1):
+                for j in range(i - 1, -1, -1):
                     prev_inf = ttinfo[lindexes[j]]
                     if not prev_inf[1]:
                         break
@@ -99,8 +98,8 @@ def build_tzinfo(zone, fp):
 
                 # Bad dst? Look further. DST > 24 hours happens when
                 # a timzone has moved across the international dateline.
-                if dst <= 0 or dst > 3600*3:
+                if dst <= 0 or dst > 3600 * 3:
-                    for j in range(i+1, len(transitions)):
+                    for j in range(i + 1, len(transitions)):
                         stdinf = ttinfo[lindexes[j]]
                         if not stdinf[1]:
                             dst = inf[0] - stdinf[0]
@@ -129,9 +128,7 @@ if __name__ == '__main__':
     from pprint import pprint
     base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
     tz = build_tzinfo('Australia/Melbourne',
-                      open(os.path.join(base,'Australia','Melbourne'), 'rb'))
+                      open(os.path.join(base, 'Australia', 'Melbourne'), 'rb'))
     tz = build_tzinfo('US/Eastern',
-                      open(os.path.join(base,'US','Eastern'), 'rb'))
+                      open(os.path.join(base, 'US', 'Eastern'), 'rb'))
     pprint(tz._utc_transition_times)
-    #print tz.asPython(4)
-    #print tz.transitions_mapping

lib/pytz/tzinfo.py

@@ -13,6 +13,8 @@ from pytz.exceptions import AmbiguousTimeError, NonExistentTimeError
 __all__ = []
 
 _timedelta_cache = {}
+
+
 def memorized_timedelta(seconds):
     '''Create only one instance of each distinct timedelta'''
     try:
@@ -24,6 +26,8 @@ def memorized_timedelta(seconds):
 
 _epoch = datetime.utcfromtimestamp(0)
 _datetime_cache = {0: _epoch}
+
+
 def memorized_datetime(seconds):
     '''Create only one instance of each distinct datetime'''
     try:
@@ -36,6 +40,8 @@ def memorized_datetime(seconds):
         return dt
 
 _ttinfo_cache = {}
+
+
 def memorized_ttinfo(*args):
     '''Create only one instance of each distinct tuple'''
     try:
@@ -51,6 +57,7 @@ def memorized_ttinfo(*args):
 
 _notime = memorized_timedelta(0)
 
+
 def _to_seconds(td):
     '''Convert a timedelta to seconds'''
     return td.seconds + td.days * 24 * 60 * 60
@@ -154,12 +161,18 @@ class DstTzInfo(BaseTzInfo):
     timezone definition.
     '''
     # Overridden in subclass
-    _utc_transition_times = None # Sorted list of DST transition times in UTC
+
-    _transition_info = None # [(utcoffset, dstoffset, tzname)] corresponding
+    # Sorted list of DST transition times, UTC
-                            # to _utc_transition_times entries
+    _utc_transition_times = None
+
+    # [(utcoffset, dstoffset, tzname)] corresponding to
+    # _utc_transition_times entries
+    _transition_info = None
+
     zone = None
 
     # Set in __init__
+
     _tzinfos = None
     _dst = None  # DST offset
 
@@ -170,7 +183,8 @@ class DstTzInfo(BaseTzInfo):
         else:
             _tzinfos = {}
             self._tzinfos = _tzinfos
-            self._utcoffset, self._dst, self._tzname = self._transition_info[0]
+            self._utcoffset, self._dst, self._tzname = (
+                self._transition_info[0])
             _tzinfos[self._transition_info[0]] = self
             for inf in self._transition_info[1:]:
                 if inf not in _tzinfos:
@@ -178,8 +192,8 @@ class DstTzInfo(BaseTzInfo):
 
     def fromutc(self, dt):
         '''See datetime.tzinfo.fromutc'''
-        if (dt.tzinfo is not None
+        if (dt.tzinfo is not None and
-            and getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
+                getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
             raise ValueError('fromutc: dt.tzinfo is not self')
         dt = dt.replace(tzinfo=None)
         idx = max(0, bisect_right(self._utc_transition_times, dt) - 1)
@@ -337,8 +351,8 @@ class DstTzInfo(BaseTzInfo):
             # obtain the correct timezone by winding the clock back.
             else:
                 return self.localize(
-                    dt - timedelta(hours=6), is_dst=False) + timedelta(hours=6)
+                    dt - timedelta(hours=6),
-
+                    is_dst=False) + timedelta(hours=6)
 
         # If we get this far, we have multiple possible timezones - this
         # is an ambiguous case occuring during the end-of-DST transition.
@@ -351,8 +365,7 @@ class DstTzInfo(BaseTzInfo):
         # Filter out the possiblilities that don't match the requested
         # is_dst
         filtered_possible_loc_dt = [
-            p for p in possible_loc_dt
+            p for p in possible_loc_dt if bool(p.tzinfo._dst) == is_dst
-                if bool(p.tzinfo._dst) == is_dst
         ]
 
         # Hopefully we only have one possibility left. Return it.
@@ -374,7 +387,8 @@ class DstTzInfo(BaseTzInfo):
         # i.e., behave like end-of-DST transition
         dates = {}  # utc -> local
         for local_dt in filtered_possible_loc_dt:
-            utc_time = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset
+            utc_time = (
+                local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset)
             assert utc_time not in dates
             dates[utc_time] = local_dt
         return dates[[min, max][not is_dst](dates)]
@@ -389,11 +403,11 @@ class DstTzInfo(BaseTzInfo):
         >>> tz = timezone('America/St_Johns')
         >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
-        >>> tz.utcoffset(ambiguous, is_dst=False)
+        >>> str(tz.utcoffset(ambiguous, is_dst=False))
-        datetime.timedelta(-1, 73800)
+        '-1 day, 20:30:00'
 
-        >>> tz.utcoffset(ambiguous, is_dst=True)
+        >>> str(tz.utcoffset(ambiguous, is_dst=True))
-        datetime.timedelta(-1, 77400)
+        '-1 day, 21:30:00'
 
         >>> try:
         ...     tz.utcoffset(ambiguous)
@@ -421,19 +435,19 @@ class DstTzInfo(BaseTzInfo):
 
         >>> normal = datetime(2009, 9, 1)
 
-        >>> tz.dst(normal)
+        >>> str(tz.dst(normal))
-        datetime.timedelta(0, 3600)
+        '1:00:00'
-        >>> tz.dst(normal, is_dst=False)
+        >>> str(tz.dst(normal, is_dst=False))
-        datetime.timedelta(0, 3600)
+        '1:00:00'
-        >>> tz.dst(normal, is_dst=True)
+        >>> str(tz.dst(normal, is_dst=True))
-        datetime.timedelta(0, 3600)
+        '1:00:00'
 
         >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
-        >>> tz.dst(ambiguous, is_dst=False)
+        >>> str(tz.dst(ambiguous, is_dst=False))
-        datetime.timedelta(0)
+        '0:00:00'
-        >>> tz.dst(ambiguous, is_dst=True)
+        >>> str(tz.dst(ambiguous, is_dst=True))
-        datetime.timedelta(0, 3600)
+        '1:00:00'
         >>> try:
         ...     tz.dst(ambiguous)
         ... except AmbiguousTimeError:
@@ -512,7 +526,6 @@ class DstTzInfo(BaseTzInfo):
         )
 
 
-
 def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
     """Factory function for unpickling pytz tzinfo instances.
 
@@ -549,8 +562,8 @@ def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
     # get changed from the initial guess by the database maintainers to
     # match reality when this information is discovered.
     for localized_tz in tz._tzinfos.values():
-        if (localized_tz._utcoffset == utcoffset
+        if (localized_tz._utcoffset == utcoffset and
-                and localized_tz._dst == dstoffset):
+                localized_tz._dst == dstoffset):
             return localized_tz
 
     # This (utcoffset, dstoffset) information has been removed from the