")[1]
+ html = splitString(split, split_on="
")[0]
+ except:
+ pass
+
+ imdbs = getImdb(html, multiple = True) if html else []
+
+ for imdb in imdbs:
+ if imdb not in movies:
+ movies.append(imdb)
+
+ if self.shuttingDown():
+ break
+
+ log.debug('Found %s movies on %s', (len(imdbs), w_url))
+
+ if len(imdbs) < 250:
break
- except:
- log.error('Failed loading IMDB watchlist: %s %s', (watchlist_url, traceback.format_exc()))
+ start += 250
+
+ except:
+ log.error('Failed loading IMDB watchlist: %s %s', (watchlist_url, traceback.format_exc()))
return movies
diff --git a/couchpotato/core/providers/automation/itunes/__init__.py b/couchpotato/core/providers/automation/itunes/__init__.py
index cc5dddc7..13526f43 100644
--- a/couchpotato/core/providers/automation/itunes/__init__.py
+++ b/couchpotato/core/providers/automation/itunes/__init__.py
@@ -1,5 +1,6 @@
from .main import ITunes
+
def start():
return ITunes()
diff --git a/couchpotato/core/providers/automation/itunes/main.py b/couchpotato/core/providers/automation/itunes/main.py
index eb68e348..76763244 100644
--- a/couchpotato/core/providers/automation/itunes/main.py
+++ b/couchpotato/core/providers/automation/itunes/main.py
@@ -22,7 +22,7 @@ class ITunes(Automation, RSS):
urls = splitString(self.conf('automation_urls'))
namespace = 'http://www.w3.org/2005/Atom'
- namespaceIM = 'http://itunes.apple.com/rss'
+ namespace_im = 'http://itunes.apple.com/rss'
index = -1
for url in urls:
@@ -42,10 +42,10 @@ class ITunes(Automation, RSS):
rss_movies = self.getElements(data, entry_tag)
for movie in rss_movies:
- name_tag = str(QName(namespaceIM, 'name'))
+ name_tag = str(QName(namespace_im, 'name'))
name = self.getTextElement(movie, name_tag)
- releaseDate_tag = str(QName(namespaceIM, 'releaseDate'))
+ releaseDate_tag = str(QName(namespace_im, 'releaseDate'))
releaseDateText = self.getTextElement(movie, releaseDate_tag)
year = datetime.datetime.strptime(releaseDateText, '%Y-%m-%dT00:00:00-07:00').strftime("%Y")
diff --git a/couchpotato/core/providers/automation/kinepolis/__init__.py b/couchpotato/core/providers/automation/kinepolis/__init__.py
index 24bd4ebb..cc4c5706 100644
--- a/couchpotato/core/providers/automation/kinepolis/__init__.py
+++ b/couchpotato/core/providers/automation/kinepolis/__init__.py
@@ -1,5 +1,6 @@
from .main import Kinepolis
+
def start():
return Kinepolis()
diff --git a/couchpotato/core/providers/automation/letterboxd/__init__.py b/couchpotato/core/providers/automation/letterboxd/__init__.py
index f2b8486b..88bfe6a1 100644
--- a/couchpotato/core/providers/automation/letterboxd/__init__.py
+++ b/couchpotato/core/providers/automation/letterboxd/__init__.py
@@ -1,5 +1,6 @@
from .main import Letterboxd
+
def start():
return Letterboxd()
diff --git a/couchpotato/core/providers/automation/letterboxd/main.py b/couchpotato/core/providers/automation/letterboxd/main.py
index 1f106dd1..dbbf53b1 100644
--- a/couchpotato/core/providers/automation/letterboxd/main.py
+++ b/couchpotato/core/providers/automation/letterboxd/main.py
@@ -1,5 +1,5 @@
from bs4 import BeautifulSoup
-from couchpotato.core.helpers.variable import tryInt, splitString
+from couchpotato.core.helpers.variable import tryInt, splitString, removeEmpty
from couchpotato.core.logger import CPLog
from couchpotato.core.providers.automation.base import Automation
import re
@@ -44,8 +44,8 @@ class Letterboxd(Automation):
soup = BeautifulSoup(self.getHTMLData(self.url % username))
- for movie in soup.find_all('a', attrs = { 'class': 'frame' }):
- match = filter(None, self.pattern.split(movie['title']))
+ for movie in soup.find_all('a', attrs = {'class': 'frame'}):
+ match = removeEmpty(self.pattern.split(movie['title']))
movies.append({'title': match[0], 'year': match[1] })
return movies
diff --git a/couchpotato/core/providers/automation/moviemeter/__init__.py b/couchpotato/core/providers/automation/moviemeter/__init__.py
index aff5d09d..0e9a4edc 100644
--- a/couchpotato/core/providers/automation/moviemeter/__init__.py
+++ b/couchpotato/core/providers/automation/moviemeter/__init__.py
@@ -1,5 +1,6 @@
from .main import Moviemeter
+
def start():
return Moviemeter()
diff --git a/couchpotato/core/providers/automation/movies_io/__init__.py b/couchpotato/core/providers/automation/movies_io/__init__.py
index 9b280930..0361223b 100644
--- a/couchpotato/core/providers/automation/movies_io/__init__.py
+++ b/couchpotato/core/providers/automation/movies_io/__init__.py
@@ -1,5 +1,6 @@
from .main import MoviesIO
+
def start():
return MoviesIO()
diff --git a/couchpotato/core/providers/automation/rottentomatoes/__init__.py b/couchpotato/core/providers/automation/rottentomatoes/__init__.py
index 4675fac2..1d3026d3 100644
--- a/couchpotato/core/providers/automation/rottentomatoes/__init__.py
+++ b/couchpotato/core/providers/automation/rottentomatoes/__init__.py
@@ -1,5 +1,6 @@
from .main import Rottentomatoes
+
def start():
return Rottentomatoes()
diff --git a/couchpotato/core/providers/automation/rottentomatoes/main.py b/couchpotato/core/providers/automation/rottentomatoes/main.py
index 69611705..c873a8e1 100644
--- a/couchpotato/core/providers/automation/rottentomatoes/main.py
+++ b/couchpotato/core/providers/automation/rottentomatoes/main.py
@@ -8,6 +8,7 @@ import re
log = CPLog(__name__)
+
class Rottentomatoes(Automation, RSS):
interval = 1800
diff --git a/couchpotato/core/providers/automation/trakt/__init__.py b/couchpotato/core/providers/automation/trakt/__init__.py
index cbaaece3..6ae2806b 100644
--- a/couchpotato/core/providers/automation/trakt/__init__.py
+++ b/couchpotato/core/providers/automation/trakt/__init__.py
@@ -1,5 +1,6 @@
from .main import Trakt
+
def start():
return Trakt()
diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py
index 89967df1..93e0900f 100644
--- a/couchpotato/core/providers/base.py
+++ b/couchpotato/core/providers/base.py
@@ -14,6 +14,7 @@ import xml.etree.ElementTree as XMLTree
log = CPLog(__name__)
+
class MultiProvider(Plugin):
def __init__(self):
@@ -36,8 +37,8 @@ class MultiProvider(Plugin):
class Provider(Plugin):
- type = None # movie, show, subtitle, trailer, ...
- http_time_between_calls = 10 # Default timeout for url requests
+ type = None # movie, show, subtitle, trailer, ...
+ http_time_between_calls = 10 # Default timeout for url requests
last_available_check = {}
is_available = {}
@@ -63,7 +64,7 @@ class Provider(Plugin):
def getJsonData(self, url, decode_from = None, **kwargs):
- cache_key = '%s%s' % (md5(url), md5('%s' % kwargs.get('params', {})))
+ cache_key = md5(url)
data = self.getCache(cache_key, url, **kwargs)
if data:
@@ -80,7 +81,7 @@ class Provider(Plugin):
def getRSSData(self, url, item_path = 'channel/item', **kwargs):
- cache_key = '%s%s' % (md5(url), md5('%s' % kwargs.get('params', {})))
+ cache_key = md5(url)
data = self.getCache(cache_key, url, **kwargs)
if data and len(data) > 0:
@@ -94,21 +95,21 @@ class Provider(Plugin):
def getHTMLData(self, url, **kwargs):
- cache_key = '%s%s' % (md5(url), md5('%s' % kwargs.get('data', {})))
+ cache_key = md5(url)
return self.getCache(cache_key, url, **kwargs)
class YarrProvider(Provider):
- protocol = None # nzb, torrent, torrent_magnet
+ protocol = None # nzb, torrent, torrent_magnet
type = 'movie'
cat_ids = {}
cat_backup_id = None
- sizeGb = ['gb', 'gib']
- sizeMb = ['mb', 'mib']
- sizeKb = ['kb', 'kib']
+ size_gb = ['gb', 'gib']
+ size_mb = ['mb', 'mib']
+ size_kb = ['kb', 'kib']
last_login_check = None
@@ -223,19 +224,19 @@ class YarrProvider(Provider):
def parseSize(self, size):
- sizeRaw = size.lower()
+ size_raw = size.lower()
size = tryFloat(re.sub(r'[^0-9.]', '', size).strip())
- for s in self.sizeGb:
- if s in sizeRaw:
+ for s in self.size_gb:
+ if s in size_raw:
return size * 1024
- for s in self.sizeMb:
- if s in sizeRaw:
+ for s in self.size_mb:
+ if s in size_raw:
return size
- for s in self.sizeKb:
- if s in sizeRaw:
+ for s in self.size_kb:
+ if s in size_raw:
return size / 1024
return 0
@@ -279,7 +280,7 @@ class ResultList(list):
new_result = self.fillResult(result)
is_correct = fireEvent('searcher.correct_release', new_result, self.media, self.quality,
- imdb_results = self.kwargs.get('imdb_results', False), single = True)
+ imdb_results = self.kwargs.get('imdb_results', False), single = True)
if is_correct and new_result['id'] not in self.result_ids:
is_correct_weight = float(is_correct)
diff --git a/couchpotato/core/providers/info/_modifier/__init__.py b/couchpotato/core/providers/info/_modifier/__init__.py
index 3bdf5e0d..9dfab703 100644
--- a/couchpotato/core/providers/info/_modifier/__init__.py
+++ b/couchpotato/core/providers/info/_modifier/__init__.py
@@ -1,7 +1,7 @@
from .main import MovieResultModifier
-def start():
+def start():
return MovieResultModifier()
config = []
diff --git a/couchpotato/core/providers/info/_modifier/main.py b/couchpotato/core/providers/info/_modifier/main.py
index c7e3a5ef..88d4381c 100644
--- a/couchpotato/core/providers/info/_modifier/main.py
+++ b/couchpotato/core/providers/info/_modifier/main.py
@@ -44,13 +44,13 @@ class MovieResultModifier(Plugin):
new_results = {}
for r in results:
type_name = r.get('type', 'movie') + 's'
- if not new_results.has_key(type_name):
+ if type_name not in new_results:
new_results[type_name] = []
new_results[type_name].append(r)
# Combine movies, needs a cleaner way..
- if new_results.has_key('movies'):
+ if 'movies' in new_results:
new_results['movies'] = self.combineOnIMDB(new_results['movies'])
return new_results
diff --git a/couchpotato/core/providers/info/couchpotatoapi/__init__.py b/couchpotato/core/providers/info/couchpotatoapi/__init__.py
index 37d9eca9..196dde6a 100644
--- a/couchpotato/core/providers/info/couchpotatoapi/__init__.py
+++ b/couchpotato/core/providers/info/couchpotatoapi/__init__.py
@@ -1,5 +1,6 @@
from .main import CouchPotatoApi
+
def start():
return CouchPotatoApi()
diff --git a/couchpotato/core/providers/info/couchpotatoapi/main.py b/couchpotato/core/providers/info/couchpotatoapi/main.py
index cf512816..848cbf05 100644
--- a/couchpotato/core/providers/info/couchpotatoapi/main.py
+++ b/couchpotato/core/providers/info/couchpotatoapi/main.py
@@ -81,7 +81,7 @@ class CouchPotatoApi(MovieProvider):
result = self.getJsonData(self.urls['info'] % identifier, headers = self.getRequestHeaders())
if result:
- return dict((k, v) for k, v in result.iteritems() if v)
+ return dict((k, v) for k, v in result.items() if v)
return {}
@@ -110,5 +110,5 @@ class CouchPotatoApi(MovieProvider):
'X-CP-Version': fireEvent('app.version', single = True),
'X-CP-API': self.api_version,
'X-CP-Time': time.time(),
- 'X-CP-Identifier': '+%s' % Env.setting('api_key', 'core')[:10], # Use first 10 as identifier, so we don't need to use IP address in api stats
+ 'X-CP-Identifier': '+%s' % Env.setting('api_key', 'core')[:10], # Use first 10 as identifier, so we don't need to use IP address in api stats
}
diff --git a/couchpotato/core/providers/info/omdbapi/__init__.py b/couchpotato/core/providers/info/omdbapi/__init__.py
index 765662e9..b7ea3932 100644
--- a/couchpotato/core/providers/info/omdbapi/__init__.py
+++ b/couchpotato/core/providers/info/omdbapi/__init__.py
@@ -1,5 +1,6 @@
from .main import OMDBAPI
+
def start():
return OMDBAPI()
diff --git a/couchpotato/core/providers/info/omdbapi/main.py b/couchpotato/core/providers/info/omdbapi/main.py
index 7c8be386..8f04d3b6 100755
--- a/couchpotato/core/providers/info/omdbapi/main.py
+++ b/couchpotato/core/providers/info/omdbapi/main.py
@@ -107,7 +107,7 @@ class OMDBAPI(MovieProvider):
'writers': splitString(movie.get('Writer', '')),
'actors': splitString(movie.get('Actors', '')),
}
- movie_data = dict((k, v) for k, v in movie_data.iteritems() if v)
+ movie_data = dict((k, v) for k, v in movie_data.items() if v)
except:
log.error('Failed parsing IMDB API json: %s', traceback.format_exc())
diff --git a/couchpotato/core/providers/info/themoviedb/__init__.py b/couchpotato/core/providers/info/themoviedb/__init__.py
index 66ac536a..b981950e 100644
--- a/couchpotato/core/providers/info/themoviedb/__init__.py
+++ b/couchpotato/core/providers/info/themoviedb/__init__.py
@@ -1,5 +1,6 @@
from .main import TheMovieDb
+
def start():
return TheMovieDb()
diff --git a/couchpotato/core/providers/info/themoviedb/main.py b/couchpotato/core/providers/info/themoviedb/main.py
index fa6896b2..d301db2b 100644
--- a/couchpotato/core/providers/info/themoviedb/main.py
+++ b/couchpotato/core/providers/info/themoviedb/main.py
@@ -1,5 +1,5 @@
from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import simplifyString, toUnicode
+from couchpotato.core.helpers.encoding import simplifyString, toUnicode, ss
from couchpotato.core.helpers.variable import tryInt
from couchpotato.core.logger import CPLog
from couchpotato.core.providers.info.base import MovieProvider
@@ -56,7 +56,7 @@ class TheMovieDb(MovieProvider):
self.setCache(cache_key, results)
return results
- except SyntaxError, e:
+ except SyntaxError as e:
log.error('Failed to parse XML response: %s', e)
return False
@@ -145,7 +145,7 @@ class TheMovieDb(MovieProvider):
'actor_roles': actors
}
- movie_data = dict((k, v) for k, v in movie_data.iteritems() if v)
+ movie_data = dict((k, v) for k, v in movie_data.items() if v)
# Add alternative names
if extended:
@@ -166,7 +166,7 @@ class TheMovieDb(MovieProvider):
try:
image_url = getattr(movie, type).geturl(size = size)
except:
- log.debug('Failed getting %s.%s for "%s"', (type, size, str(movie)))
+ log.debug('Failed getting %s.%s for "%s"', (type, size, ss(str(movie))))
return image_url
diff --git a/couchpotato/core/providers/metadata/base.py b/couchpotato/core/providers/metadata/base.py
index f5610030..72d07609 100644
--- a/couchpotato/core/providers/metadata/base.py
+++ b/couchpotato/core/providers/metadata/base.py
@@ -25,7 +25,7 @@ class MetaDataBase(Plugin):
# Update library to get latest info
try:
- updated_library = fireEvent('library.update.movie', group['library']['identifier'], force = True, single = True)
+ updated_library = fireEvent('library.update.movie', group['library']['identifier'], extended = True, single = True)
group['library'] = mergeDicts(group['library'], updated_library)
except:
log.error('Failed to update movie, before creating metadata: %s', traceback.format_exc())
diff --git a/couchpotato/core/providers/metadata/wmc/__init__.py b/couchpotato/core/providers/metadata/wmc/__init__.py
index 290436c6..167a24d7 100644
--- a/couchpotato/core/providers/metadata/wmc/__init__.py
+++ b/couchpotato/core/providers/metadata/wmc/__init__.py
@@ -1,5 +1,6 @@
from .main import WindowsMediaCenter
+
def start():
return WindowsMediaCenter()
diff --git a/couchpotato/core/providers/metadata/wmc/main.py b/couchpotato/core/providers/metadata/wmc/main.py
index 89258918..f84897b4 100644
--- a/couchpotato/core/providers/metadata/wmc/main.py
+++ b/couchpotato/core/providers/metadata/wmc/main.py
@@ -1,6 +1,7 @@
from couchpotato.core.providers.metadata.base import MetaDataBase
import os
+
class WindowsMediaCenter(MetaDataBase):
def getThumbnailName(self, name, root):
diff --git a/couchpotato/core/providers/metadata/xbmc/__init__.py b/couchpotato/core/providers/metadata/xbmc/__init__.py
index ea426dba..deb5c908 100644
--- a/couchpotato/core/providers/metadata/xbmc/__init__.py
+++ b/couchpotato/core/providers/metadata/xbmc/__init__.py
@@ -1,5 +1,6 @@
from .main import XBMC
+
def start():
return XBMC()
diff --git a/couchpotato/core/providers/metadata/xbmc/main.py b/couchpotato/core/providers/metadata/xbmc/main.py
index 93e717f8..267b2822 100644
--- a/couchpotato/core/providers/metadata/xbmc/main.py
+++ b/couchpotato/core/providers/metadata/xbmc/main.py
@@ -132,7 +132,7 @@ class XBMC(MetaDataBase):
# Add trailer if found
trailer_found = False
if data.get('renamed_files'):
- for filename in data.get('renamed_files'):
+ for filename in data.get('renamed_files'):
if 'trailer' in filename:
trailer = SubElement(nfoxml, 'trailer')
trailer.text = toUnicode(filename)
diff --git a/couchpotato/core/providers/nzb/binsearch/__init__.py b/couchpotato/core/providers/nzb/binsearch/__init__.py
index 1cfb0b73..c80ee6d9 100644
--- a/couchpotato/core/providers/nzb/binsearch/__init__.py
+++ b/couchpotato/core/providers/nzb/binsearch/__init__.py
@@ -1,5 +1,6 @@
from .main import BinSearch
+
def start():
return BinSearch()
diff --git a/couchpotato/core/providers/nzb/binsearch/main.py b/couchpotato/core/providers/nzb/binsearch/main.py
index 54cb1abc..c54dd435 100644
--- a/couchpotato/core/providers/nzb/binsearch/main.py
+++ b/couchpotato/core/providers/nzb/binsearch/main.py
@@ -18,7 +18,7 @@ class BinSearch(NZBProvider):
'search': 'https://www.binsearch.info/index.php?%s',
}
- http_time_between_calls = 4 # Seconds
+ http_time_between_calls = 4 # Seconds
def _search(self, movie, quality, results):
diff --git a/couchpotato/core/providers/nzb/newznab/__init__.py b/couchpotato/core/providers/nzb/newznab/__init__.py
index e0bf5704..97f1cfad 100644
--- a/couchpotato/core/providers/nzb/newznab/__init__.py
+++ b/couchpotato/core/providers/nzb/newznab/__init__.py
@@ -1,5 +1,6 @@
from .main import Newznab
+
def start():
return Newznab()
diff --git a/couchpotato/core/providers/nzb/newznab/main.py b/couchpotato/core/providers/nzb/newznab/main.py
index 49c3ae92..deadaa1c 100644
--- a/couchpotato/core/providers/nzb/newznab/main.py
+++ b/couchpotato/core/providers/nzb/newznab/main.py
@@ -25,7 +25,7 @@ class Newznab(NZBProvider, RSS):
limits_reached = {}
- http_time_between_calls = 1 # Seconds
+ http_time_between_calls = 1 # Seconds
def search(self, movie, quality):
hosts = self.getHosts()
@@ -180,7 +180,7 @@ class Newznab(NZBProvider, RSS):
data = self.urlopen(finalurl, show_error = False)
self.limits_reached[host] = False
return data
- except HTTPError, e:
+ except HTTPError as e:
if e.code == 503:
response = e.read().lower()
if 'maximum api' in response or 'download limit' in response:
diff --git a/couchpotato/core/providers/nzb/nzbclub/__init__.py b/couchpotato/core/providers/nzb/nzbclub/__init__.py
index 95eeea13..02a69404 100644
--- a/couchpotato/core/providers/nzb/nzbclub/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbclub/__init__.py
@@ -1,5 +1,6 @@
from .main import NZBClub
+
def start():
return NZBClub()
diff --git a/couchpotato/core/providers/nzb/nzbclub/main.py b/couchpotato/core/providers/nzb/nzbclub/main.py
index 59382dfd..778cdbcd 100644
--- a/couchpotato/core/providers/nzb/nzbclub/main.py
+++ b/couchpotato/core/providers/nzb/nzbclub/main.py
@@ -16,7 +16,7 @@ class NZBClub(NZBProvider, RSS):
'search': 'http://www.nzbclub.com/nzbfeed.aspx?%s',
}
- http_time_between_calls = 4 #seconds
+ http_time_between_calls = 4 #seconds
def _searchOnTitle(self, title, movie, quality, results):
diff --git a/couchpotato/core/providers/nzb/nzbindex/__init__.py b/couchpotato/core/providers/nzb/nzbindex/__init__.py
index 47461e63..acb53e19 100644
--- a/couchpotato/core/providers/nzb/nzbindex/__init__.py
+++ b/couchpotato/core/providers/nzb/nzbindex/__init__.py
@@ -1,5 +1,6 @@
from .main import NzbIndex
+
def start():
return NzbIndex()
diff --git a/couchpotato/core/providers/nzb/nzbindex/main.py b/couchpotato/core/providers/nzb/nzbindex/main.py
index 17b87fac..a143c199 100644
--- a/couchpotato/core/providers/nzb/nzbindex/main.py
+++ b/couchpotato/core/providers/nzb/nzbindex/main.py
@@ -19,7 +19,7 @@ class NzbIndex(NZBProvider, RSS):
'search': 'https://www.nzbindex.com/rss/?%s',
}
- http_time_between_calls = 1 # Seconds
+ http_time_between_calls = 1 # Seconds
def _searchOnTitle(self, title, movie, quality, results):
diff --git a/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py b/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
index 933aff3e..2f3990de 100644
--- a/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
+++ b/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
@@ -1,5 +1,6 @@
from .main import OMGWTFNZBs
+
def start():
return OMGWTFNZBs()
diff --git a/couchpotato/core/providers/nzb/omgwtfnzbs/main.py b/couchpotato/core/providers/nzb/omgwtfnzbs/main.py
index 8cc4a3eb..93925752 100644
--- a/couchpotato/core/providers/nzb/omgwtfnzbs/main.py
+++ b/couchpotato/core/providers/nzb/omgwtfnzbs/main.py
@@ -18,7 +18,7 @@ class OMGWTFNZBs(NZBProvider, RSS):
'detail_url': 'https://omgwtfnzbs.org/details.php?id=%s',
}
- http_time_between_calls = 1 #seconds
+ http_time_between_calls = 1 #seconds
cat_ids = [
([15], ['dvdrip']),
diff --git a/couchpotato/core/providers/torrent/awesomehd/__init__.py b/couchpotato/core/providers/torrent/awesomehd/__init__.py
index de6a2144..6f076703 100644
--- a/couchpotato/core/providers/torrent/awesomehd/__init__.py
+++ b/couchpotato/core/providers/torrent/awesomehd/__init__.py
@@ -1,5 +1,6 @@
from .main import AwesomeHD
+
def start():
return AwesomeHD()
diff --git a/couchpotato/core/providers/torrent/awesomehd/main.py b/couchpotato/core/providers/torrent/awesomehd/main.py
index 79482f2a..ca6a30df 100644
--- a/couchpotato/core/providers/torrent/awesomehd/main.py
+++ b/couchpotato/core/providers/torrent/awesomehd/main.py
@@ -11,10 +11,10 @@ log = CPLog(__name__)
class AwesomeHD(TorrentProvider):
urls = {
- 'test' : 'https://awesome-hd.net/',
- 'detail' : 'https://awesome-hd.net/torrents.php?torrentid=%s',
- 'search' : 'https://awesome-hd.net/searchapi.php?action=imdbsearch&passkey=%s&imdb=%s&internal=%s',
- 'download' : 'https://awesome-hd.net/torrents.php?action=download&id=%s&authkey=%s&torrent_pass=%s',
+ 'test': 'https://awesome-hd.net/',
+ 'detail': 'https://awesome-hd.net/torrents.php?torrentid=%s',
+ 'search': 'https://awesome-hd.net/searchapi.php?action=imdbsearch&passkey=%s&imdb=%s&internal=%s',
+ 'download': 'https://awesome-hd.net/torrents.php?action=download&id=%s&authkey=%s&torrent_pass=%s',
}
http_time_between_calls = 1
diff --git a/couchpotato/core/providers/torrent/base.py b/couchpotato/core/providers/torrent/base.py
index c16e6c52..e134c8f3 100644
--- a/couchpotato/core/providers/torrent/base.py
+++ b/couchpotato/core/providers/torrent/base.py
@@ -1,3 +1,4 @@
+import traceback
from couchpotato.core.helpers.variable import getImdb, md5, cleanHost
from couchpotato.core.logger import CPLog
from couchpotato.core.providers.base import YarrProvider
@@ -14,22 +15,6 @@ class TorrentProvider(YarrProvider):
proxy_domain = None
proxy_list = []
- def imdbMatch(self, url, imdbId):
- if getImdb(url) == imdbId:
- return True
-
- if url[:4] == 'http':
- try:
- cache_key = md5(url)
- data = self.getCache(cache_key, url)
- except IOError:
- log.error('Failed to open %s.', url)
- return False
-
- return getImdb(data) == imdbId
-
- return False
-
def getDomain(self, url = ''):
forced_domain = self.conf('domain')
@@ -48,7 +33,7 @@ class TorrentProvider(YarrProvider):
try:
data = self.urlopen(proxy, timeout = 3, show_error = False)
except:
- log.debug('Failed %s proxy %s', (self.getName(), proxy))
+ log.debug('Failed %s proxy %s: %s', (self.getName(), proxy, traceback.format_exc()))
if self.correctProxy(data):
log.debug('Using proxy for %s: %s', (self.getName(), proxy))
@@ -63,9 +48,10 @@ class TorrentProvider(YarrProvider):
return cleanHost(self.proxy_domain).rstrip('/') + url
- def correctProxy(self):
+ def correctProxy(self, data):
return True
+
class TorrentMagnetProvider(TorrentProvider):
protocol = 'torrent_magnet'
diff --git a/couchpotato/core/providers/torrent/bithdtv/__init__.py b/couchpotato/core/providers/torrent/bithdtv/__init__.py
index 8c6f97a0..ffc5363f 100644
--- a/couchpotato/core/providers/torrent/bithdtv/__init__.py
+++ b/couchpotato/core/providers/torrent/bithdtv/__init__.py
@@ -1,5 +1,6 @@
from .main import BiTHDTV
+
def start():
return BiTHDTV()
diff --git a/couchpotato/core/providers/torrent/bithdtv/main.py b/couchpotato/core/providers/torrent/bithdtv/main.py
index 0045fb80..90117de4 100644
--- a/couchpotato/core/providers/torrent/bithdtv/main.py
+++ b/couchpotato/core/providers/torrent/bithdtv/main.py
@@ -7,14 +7,15 @@ import traceback
log = CPLog(__name__)
+
class BiTHDTV(TorrentProvider):
urls = {
- 'test' : 'http://www.bit-hdtv.com/',
- 'login' : 'http://www.bit-hdtv.com/takelogin.php',
+ 'test': 'http://www.bit-hdtv.com/',
+ 'login': 'http://www.bit-hdtv.com/takelogin.php',
'login_check': 'http://www.bit-hdtv.com/messages.php',
- 'detail' : 'http://www.bit-hdtv.com/details.php?id=%s',
- 'search' : 'http://www.bit-hdtv.com/torrents.php?',
+ 'detail': 'http://www.bit-hdtv.com/details.php?id=%s',
+ 'search': 'http://www.bit-hdtv.com/torrents.php?',
}
# Searches for movies only - BiT-HDTV's subcategory and resolution search filters appear to be broken
diff --git a/couchpotato/core/providers/torrent/bitsoup/__init__.py b/couchpotato/core/providers/torrent/bitsoup/__init__.py
index a36ab08f..da07cc3b 100644
--- a/couchpotato/core/providers/torrent/bitsoup/__init__.py
+++ b/couchpotato/core/providers/torrent/bitsoup/__init__.py
@@ -1,5 +1,6 @@
from .main import Bitsoup
+
def start():
return Bitsoup()
diff --git a/couchpotato/core/providers/torrent/bitsoup/main.py b/couchpotato/core/providers/torrent/bitsoup/main.py
index 0c6c9574..a709c5c1 100644
--- a/couchpotato/core/providers/torrent/bitsoup/main.py
+++ b/couchpotato/core/providers/torrent/bitsoup/main.py
@@ -12,7 +12,7 @@ class Bitsoup(TorrentProvider):
urls = {
'test': 'https://www.bitsoup.me/',
- 'login' : 'https://www.bitsoup.me/takelogin.php',
+ 'login': 'https://www.bitsoup.me/takelogin.php',
'login_check': 'https://www.bitsoup.me/my.php',
'search': 'https://www.bitsoup.me/browse.php?',
'baseurl': 'https://www.bitsoup.me/%s',
diff --git a/couchpotato/core/providers/torrent/hdbits/__init__.py b/couchpotato/core/providers/torrent/hdbits/__init__.py
index 07ea95d6..1e9aa3ce 100644
--- a/couchpotato/core/providers/torrent/hdbits/__init__.py
+++ b/couchpotato/core/providers/torrent/hdbits/__init__.py
@@ -1,5 +1,6 @@
from .main import HDBits
+
def start():
return HDBits()
@@ -21,11 +22,6 @@ config = [{
'name': 'username',
'default': '',
},
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
{
'name': 'passkey',
'default': '',
diff --git a/couchpotato/core/providers/torrent/hdbits/main.py b/couchpotato/core/providers/torrent/hdbits/main.py
index 1d3516fe..ce17bbac 100644
--- a/couchpotato/core/providers/torrent/hdbits/main.py
+++ b/couchpotato/core/providers/torrent/hdbits/main.py
@@ -1,7 +1,9 @@
-from bs4 import BeautifulSoup
from couchpotato.core.helpers.variable import tryInt
from couchpotato.core.logger import CPLog
from couchpotato.core.providers.torrent.base import TorrentProvider
+
+import re
+import json
import traceback
log = CPLog(__name__)
@@ -10,50 +12,52 @@ log = CPLog(__name__)
class HDBits(TorrentProvider):
urls = {
- 'test' : 'https://hdbits.org/',
- 'login' : 'https://hdbits.org/login/doLogin/',
- 'detail' : 'https://hdbits.org/details.php?id=%s&source=browse',
- 'search' : 'https://hdbits.org/json_search.php?imdb=%s',
- 'download' : 'https://hdbits.org/download.php/%s.torrent?id=%s&passkey=%s&source=details.browse',
- 'login_check': 'http://hdbits.org/inbox.php',
+ 'test': 'https://hdbits.org/',
+ 'detail': 'https://hdbits.org/details.php?id=%s',
+ 'download': 'https://hdbits.org/download.php?id=%s&passkey=%s',
+ 'api': 'https://hdbits.org/api/torrents'
}
http_time_between_calls = 1 #seconds
+ def _post_query(self, **params):
+
+ post_data = {
+ 'username': self.conf('username'),
+ 'passkey': self.conf('passkey')
+ }
+ post_data.update(params)
+
+ try:
+ result = self.getJsonData(self.urls['api'], data = json.dumps(post_data))
+
+ if result:
+ if result['status'] != 0:
+ log.error('Error searching hdbits: %s' % result['message'])
+ else:
+ return result['data']
+ except:
+ pass
+
+ return None
+
def _search(self, movie, quality, results):
- data = self.getJsonData(self.urls['search'] % movie['library']['identifier'])
+ match = re.match(r'tt(\d{7})', movie['library']['identifier'])
+
+ data = self._post_query(imdb = {'id': match.group(1)})
if data:
try:
for result in data:
results.append({
'id': result['id'],
- 'name': result['title'],
- 'url': self.urls['download'] % (result['id'], result['id'], self.conf('passkey')),
+ 'name': result['name'],
+ 'url': self.urls['download'] % (result['id'], self.conf('passkey')),
'detail_url': self.urls['detail'] % result['id'],
'size': self.parseSize(result['size']),
- 'seeders': tryInt(result['seeder']),
- 'leechers': tryInt(result['leecher'])
+ 'seeders': tryInt(result['seeders']),
+ 'leechers': tryInt(result['leechers'])
})
-
except:
log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
- def getLoginParams(self):
- data = self.getHTMLData('https://hdbits.org/login', cache_timeout = 0)
-
- bs = BeautifulSoup(data)
- secret = bs.find('input', attrs = {'name': 'lol'})['value']
-
- return {
- 'uname': self.conf('username'),
- 'password': self.conf('password'),
- 'returnto': '/',
- 'lol': secret
- }
-
- def loginSuccess(self, output):
- return '/logout.php' in output.lower()
-
- loginCheckSuccess = loginSuccess
diff --git a/couchpotato/core/providers/torrent/ilovetorrents/__init__.py b/couchpotato/core/providers/torrent/ilovetorrents/__init__.py
index c6702d7f..f3f7b479 100644
--- a/couchpotato/core/providers/torrent/ilovetorrents/__init__.py
+++ b/couchpotato/core/providers/torrent/ilovetorrents/__init__.py
@@ -1,4 +1,5 @@
-from main import ILoveTorrents
+from .main import ILoveTorrents
+
def start():
return ILoveTorrents()
@@ -18,14 +19,14 @@ config = [{
'type': 'enabler',
'default': False
},
- {
+ {
'name': 'username',
'label': 'Username',
'type': 'string',
'default': '',
'description': 'The user name for your ILT account',
},
- {
+ {
'name': 'password',
'label': 'Password',
'type': 'password',
diff --git a/couchpotato/core/providers/torrent/ilovetorrents/main.py b/couchpotato/core/providers/torrent/ilovetorrents/main.py
index 7181016a..6d56ea48 100644
--- a/couchpotato/core/providers/torrent/ilovetorrents/main.py
+++ b/couchpotato/core/providers/torrent/ilovetorrents/main.py
@@ -14,10 +14,10 @@ class ILoveTorrents(TorrentProvider):
urls = {
'download': 'http://www.ilovetorrents.me/%s',
'detail': 'http://www.ilovetorrents.me/%s',
- 'search': 'http://www.ilovetorrents.me/browse.php?search=%s&page=%s&cat=%s',
- 'test' : 'http://www.ilovetorrents.me/',
- 'login' : 'http://www.ilovetorrents.me/takelogin.php',
- 'login_check' : 'http://www.ilovetorrents.me'
+ 'search': 'http://www.ilovetorrents.me/browse.php?search=%s&page=%s&cat=%s',
+ 'test': 'http://www.ilovetorrents.me/',
+ 'login': 'http://www.ilovetorrents.me/takelogin.php',
+ 'login_check': 'http://www.ilovetorrents.me'
}
cat_ids = [
diff --git a/couchpotato/core/providers/torrent/iptorrents/__init__.py b/couchpotato/core/providers/torrent/iptorrents/__init__.py
index 6cb2dead..579d7974 100644
--- a/couchpotato/core/providers/torrent/iptorrents/__init__.py
+++ b/couchpotato/core/providers/torrent/iptorrents/__init__.py
@@ -1,5 +1,6 @@
from .main import IPTorrents
+
def start():
return IPTorrents()
diff --git a/couchpotato/core/providers/torrent/iptorrents/main.py b/couchpotato/core/providers/torrent/iptorrents/main.py
index a02b97f2..35ce25c0 100644
--- a/couchpotato/core/providers/torrent/iptorrents/main.py
+++ b/couchpotato/core/providers/torrent/iptorrents/main.py
@@ -11,11 +11,11 @@ log = CPLog(__name__)
class IPTorrents(TorrentProvider):
urls = {
- 'test' : 'http://www.iptorrents.com/',
- 'base_url' : 'http://www.iptorrents.com',
- 'login' : 'http://www.iptorrents.com/torrents/',
+ 'test': 'http://www.iptorrents.com/',
+ 'base_url': 'http://www.iptorrents.com',
+ 'login': 'http://www.iptorrents.com/torrents/',
'login_check': 'http://www.iptorrents.com/inbox.php',
- 'search' : 'http://www.iptorrents.com/torrents/?l%d=1%s&q=%s&qf=ti&p=%d',
+ 'search': 'http://www.iptorrents.com/torrents/?l%d=1%s&q=%s&qf=ti&p=%d',
}
cat_ids = [
@@ -99,7 +99,8 @@ class IPTorrents(TorrentProvider):
result = {}
for x, col in enumerate(entries[0].find_all('th')):
- key = toSafeString(col.text).strip().lower()
+ name = col.text or col.find('img')['title']
+ key = toSafeString(name).strip().lower()
if not key:
continue
diff --git a/couchpotato/core/providers/torrent/kickasstorrents/__init__.py b/couchpotato/core/providers/torrent/kickasstorrents/__init__.py
index 0b79c81a..ffe1040b 100644
--- a/couchpotato/core/providers/torrent/kickasstorrents/__init__.py
+++ b/couchpotato/core/providers/torrent/kickasstorrents/__init__.py
@@ -1,5 +1,6 @@
from .main import KickAssTorrents
+
def start():
return KickAssTorrents()
diff --git a/couchpotato/core/providers/torrent/kickasstorrents/main.py b/couchpotato/core/providers/torrent/kickasstorrents/main.py
index 50f14ce2..f96e9812 100644
--- a/couchpotato/core/providers/torrent/kickasstorrents/main.py
+++ b/couchpotato/core/providers/torrent/kickasstorrents/main.py
@@ -24,7 +24,7 @@ class KickAssTorrents(TorrentMagnetProvider):
(['dvd'], ['dvdr']),
]
- http_time_between_calls = 1 #seconds
+ http_time_between_calls = 1 #seconds
cat_backup_id = None
proxy_list = [
@@ -45,7 +45,7 @@ class KickAssTorrents(TorrentMagnetProvider):
try:
html = BeautifulSoup(data)
- resultdiv = html.find('div', attrs = {'class':'tabs'})
+ resultdiv = html.find('div', attrs = {'class': 'tabs'})
for result in resultdiv.find_all('div', recursive = False):
if result.get('id').lower().strip('tab-') not in cat_ids:
continue
@@ -107,7 +107,6 @@ class KickAssTorrents(TorrentMagnetProvider):
return tryInt(age)
-
def isEnabled(self):
return super(KickAssTorrents, self).isEnabled() and self.getDomain()
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
index 66b3ea76..a3e57c79 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
@@ -1,4 +1,5 @@
-from main import PassThePopcorn
+from .main import PassThePopcorn
+
def start():
return PassThePopcorn()
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
index 5cd3aed6..66cad33c 100644
--- a/couchpotato/core/providers/torrent/passthepopcorn/main.py
+++ b/couchpotato/core/providers/torrent/passthepopcorn/main.py
@@ -8,6 +8,7 @@ import json
import re
import time
import traceback
+import six
log = CPLog(__name__)
@@ -15,12 +16,12 @@ log = CPLog(__name__)
class PassThePopcorn(TorrentProvider):
urls = {
- 'domain': 'https://tls.passthepopcorn.me',
- 'detail': 'https://tls.passthepopcorn.me/torrents.php?torrentid=%s',
- 'torrent': 'https://tls.passthepopcorn.me/torrents.php',
- 'login': 'https://tls.passthepopcorn.me/ajax.php?action=login',
- 'login_check': 'https://tls.passthepopcorn.me/ajax.php?action=login',
- 'search': 'https://tls.passthepopcorn.me/search/%s/0/7/%d'
+ 'domain': 'https://tls.passthepopcorn.me',
+ 'detail': 'https://tls.passthepopcorn.me/torrents.php?torrentid=%s',
+ 'torrent': 'https://tls.passthepopcorn.me/torrents.php',
+ 'login': 'https://tls.passthepopcorn.me/ajax.php?action=login',
+ 'login_check': 'https://tls.passthepopcorn.me/ajax.php?action=login',
+ 'search': 'https://tls.passthepopcorn.me/search/%s/0/7/%d'
}
http_time_between_calls = 2
@@ -178,7 +179,7 @@ class PassThePopcorn(TorrentProvider):
except KeyError:
pass
return text # leave as is
- return re.sub("&#?\w+;", fixup, u'%s' % text)
+ return re.sub("&#?\w+;", fixup, six.u('%s') % text)
def unicodeToASCII(self, text):
import unicodedata
diff --git a/couchpotato/core/providers/torrent/publichd/__init__.py b/couchpotato/core/providers/torrent/publichd/__init__.py
index ace12880..3c20c51f 100644
--- a/couchpotato/core/providers/torrent/publichd/__init__.py
+++ b/couchpotato/core/providers/torrent/publichd/__init__.py
@@ -1,5 +1,6 @@
from .main import PublicHD
+
def start():
return PublicHD()
diff --git a/couchpotato/core/providers/torrent/publichd/main.py b/couchpotato/core/providers/torrent/publichd/main.py
index 7b497fd9..b7c32fba 100644
--- a/couchpotato/core/providers/torrent/publichd/main.py
+++ b/couchpotato/core/providers/torrent/publichd/main.py
@@ -76,7 +76,7 @@ class PublicHD(TorrentMagnetProvider):
try:
full_description = self.urlopen(item['detail_url'])
html = BeautifulSoup(full_description)
- nfo_pre = html.find('div', attrs = {'id':'torrmain'})
+ nfo_pre = html.find('div', attrs = {'id': 'torrmain'})
description = toUnicode(nfo_pre.text) if nfo_pre else ''
except:
log.error('Failed getting more info for %s', item['name'])
diff --git a/couchpotato/core/providers/torrent/sceneaccess/__init__.py b/couchpotato/core/providers/torrent/sceneaccess/__init__.py
index 4b675573..3fa5d97f 100644
--- a/couchpotato/core/providers/torrent/sceneaccess/__init__.py
+++ b/couchpotato/core/providers/torrent/sceneaccess/__init__.py
@@ -1,5 +1,6 @@
from .main import SceneAccess
+
def start():
return SceneAccess()
diff --git a/couchpotato/core/providers/torrent/sceneaccess/main.py b/couchpotato/core/providers/torrent/sceneaccess/main.py
index 4113d389..a43c49bb 100644
--- a/couchpotato/core/providers/torrent/sceneaccess/main.py
+++ b/couchpotato/core/providers/torrent/sceneaccess/main.py
@@ -25,7 +25,7 @@ class SceneAccess(TorrentProvider):
([8], ['dvdr']),
]
- http_time_between_calls = 1 #seconds
+ http_time_between_calls = 1 #seconds
def _search(self, movie, quality, results):
diff --git a/couchpotato/core/providers/torrent/thepiratebay/__init__.py b/couchpotato/core/providers/torrent/thepiratebay/__init__.py
index 8cf9f86c..8b3921cd 100644
--- a/couchpotato/core/providers/torrent/thepiratebay/__init__.py
+++ b/couchpotato/core/providers/torrent/thepiratebay/__init__.py
@@ -1,4 +1,5 @@
-from main import ThePirateBay
+from .main import ThePirateBay
+
def start():
return ThePirateBay()
diff --git a/couchpotato/core/providers/torrent/thepiratebay/main.py b/couchpotato/core/providers/torrent/thepiratebay/main.py
index b967d5f0..f8b77787 100644
--- a/couchpotato/core/providers/torrent/thepiratebay/main.py
+++ b/couchpotato/core/providers/torrent/thepiratebay/main.py
@@ -5,6 +5,7 @@ from couchpotato.core.logger import CPLog
from couchpotato.core.providers.torrent.base import TorrentMagnetProvider
import re
import traceback
+import six
log = CPLog(__name__)
@@ -12,15 +13,15 @@ log = CPLog(__name__)
class ThePirateBay(TorrentMagnetProvider):
urls = {
- 'detail': '%s/torrent/%s',
- 'search': '%s/search/%s/%s/7/%s'
+ 'detail': '%s/torrent/%s',
+ 'search': '%s/search/%s/%s/7/%s'
}
cat_ids = [
- ([207], ['720p', '1080p']),
- ([201], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr']),
- ([201, 207], ['brrip']),
- ([202], ['dvdr'])
+ ([207], ['720p', '1080p']),
+ ([201], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr']),
+ ([201, 207], ['brrip']),
+ ([202], ['dvdr'])
]
cat_backup_id = 200
@@ -73,7 +74,7 @@ class ThePirateBay(TorrentMagnetProvider):
download = result.find(href = re.compile('magnet:'))
try:
- size = re.search('Size (?P.+),', unicode(result.select('font.detDesc')[0])).group('size')
+ size = re.search('Size (?P.+),', six.text_type(result.select('font.detDesc')[0])).group('size')
except:
continue
@@ -111,7 +112,7 @@ class ThePirateBay(TorrentMagnetProvider):
def getMoreInfo(self, item):
full_description = self.getCache('tpb.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
html = BeautifulSoup(full_description)
- nfo_pre = html.find('div', attrs = {'class':'nfo'})
+ nfo_pre = html.find('div', attrs = {'class': 'nfo'})
description = toUnicode(nfo_pre.text) if nfo_pre else ''
item['description'] = description
diff --git a/couchpotato/core/providers/torrent/torrentbytes/__init__.py b/couchpotato/core/providers/torrent/torrentbytes/__init__.py
index 712eac85..79dec932 100644
--- a/couchpotato/core/providers/torrent/torrentbytes/__init__.py
+++ b/couchpotato/core/providers/torrent/torrentbytes/__init__.py
@@ -1,5 +1,6 @@
from .main import TorrentBytes
+
def start():
return TorrentBytes()
diff --git a/couchpotato/core/providers/torrent/torrentbytes/main.py b/couchpotato/core/providers/torrent/torrentbytes/main.py
index 63f82768..603da6e0 100644
--- a/couchpotato/core/providers/torrent/torrentbytes/main.py
+++ b/couchpotato/core/providers/torrent/torrentbytes/main.py
@@ -11,21 +11,21 @@ log = CPLog(__name__)
class TorrentBytes(TorrentProvider):
urls = {
- 'test' : 'https://www.torrentbytes.net/',
- 'login' : 'https://www.torrentbytes.net/takelogin.php',
- 'login_check' : 'https://www.torrentbytes.net/inbox.php',
- 'detail' : 'https://www.torrentbytes.net/details.php?id=%s',
- 'search' : 'https://www.torrentbytes.net/browse.php?search=%s&cat=%d',
- 'download' : 'https://www.torrentbytes.net/download.php?id=%s&name=%s',
+ 'test': 'https://www.torrentbytes.net/',
+ 'login': 'https://www.torrentbytes.net/takelogin.php',
+ 'login_check': 'https://www.torrentbytes.net/inbox.php',
+ 'detail': 'https://www.torrentbytes.net/details.php?id=%s',
+ 'search': 'https://www.torrentbytes.net/browse.php?search=%s&cat=%d',
+ 'download': 'https://www.torrentbytes.net/download.php?id=%s&name=%s',
}
cat_ids = [
- ([5], ['720p', '1080p']),
+ ([5], ['720p', '1080p', 'bd50']),
([19], ['cam']),
([19], ['ts', 'tc']),
([19], ['r5', 'scr']),
([19], ['dvdrip']),
- ([5], ['brrip']),
+ ([19], ['brrip']),
([20], ['dvdr']),
]
diff --git a/couchpotato/core/providers/torrent/torrentday/__init__.py b/couchpotato/core/providers/torrent/torrentday/__init__.py
index d98bb917..133ec914 100644
--- a/couchpotato/core/providers/torrent/torrentday/__init__.py
+++ b/couchpotato/core/providers/torrent/torrentday/__init__.py
@@ -1,5 +1,6 @@
from .main import TorrentDay
+
def start():
return TorrentDay()
diff --git a/couchpotato/core/providers/torrent/torrentday/main.py b/couchpotato/core/providers/torrent/torrentday/main.py
index ffd88f86..6d343234 100644
--- a/couchpotato/core/providers/torrent/torrentday/main.py
+++ b/couchpotato/core/providers/torrent/torrentday/main.py
@@ -23,7 +23,7 @@ class TorrentDay(TorrentProvider):
([5], ['bd50']),
]
- http_time_between_calls = 1 #seconds
+ http_time_between_calls = 1 #seconds
def _searchOnTitle(self, title, movie, quality, results):
diff --git a/couchpotato/core/providers/torrent/torrentleech/__init__.py b/couchpotato/core/providers/torrent/torrentleech/__init__.py
index c788477f..e64d4baa 100644
--- a/couchpotato/core/providers/torrent/torrentleech/__init__.py
+++ b/couchpotato/core/providers/torrent/torrentleech/__init__.py
@@ -1,5 +1,6 @@
from .main import TorrentLeech
+
def start():
return TorrentLeech()
diff --git a/couchpotato/core/providers/torrent/torrentleech/main.py b/couchpotato/core/providers/torrent/torrentleech/main.py
index 017829bd..ea6158df 100644
--- a/couchpotato/core/providers/torrent/torrentleech/main.py
+++ b/couchpotato/core/providers/torrent/torrentleech/main.py
@@ -12,12 +12,12 @@ log = CPLog(__name__)
class TorrentLeech(TorrentProvider):
urls = {
- 'test' : 'http://www.torrentleech.org/',
- 'login' : 'http://www.torrentleech.org/user/account/login/',
+ 'test': 'http://www.torrentleech.org/',
+ 'login': 'http://www.torrentleech.org/user/account/login/',
'login_check': 'http://torrentleech.org/user/messages',
- 'detail' : 'http://www.torrentleech.org/torrent/%s',
- 'search' : 'http://www.torrentleech.org/torrents/browse/index/query/%s/categories/%d',
- 'download' : 'http://www.torrentleech.org%s',
+ 'detail': 'http://www.torrentleech.org/torrent/%s',
+ 'search': 'http://www.torrentleech.org/torrents/browse/index/query/%s/categories/%d',
+ 'download': 'http://www.torrentleech.org%s',
}
cat_ids = [
diff --git a/couchpotato/core/providers/torrent/torrentpotato/__init__.py b/couchpotato/core/providers/torrent/torrentpotato/__init__.py
index 5054f98c..03795ffb 100644
--- a/couchpotato/core/providers/torrent/torrentpotato/__init__.py
+++ b/couchpotato/core/providers/torrent/torrentpotato/__init__.py
@@ -1,5 +1,6 @@
from .main import TorrentPotato
+
def start():
return TorrentPotato()
diff --git a/couchpotato/core/providers/torrent/torrentpotato/main.py b/couchpotato/core/providers/torrent/torrentpotato/main.py
index a76c0c8f..eaaf8d2c 100644
--- a/couchpotato/core/providers/torrent/torrentpotato/main.py
+++ b/couchpotato/core/providers/torrent/torrentpotato/main.py
@@ -15,7 +15,7 @@ class TorrentPotato(TorrentProvider):
urls = {}
limits_reached = {}
- http_time_between_calls = 1 # Seconds
+ http_time_between_calls = 1 # Seconds
def search(self, movie, quality):
hosts = self.getHosts()
diff --git a/couchpotato/core/providers/torrent/torrentshack/__init__.py b/couchpotato/core/providers/torrent/torrentshack/__init__.py
index 4171fc49..0e552116 100644
--- a/couchpotato/core/providers/torrent/torrentshack/__init__.py
+++ b/couchpotato/core/providers/torrent/torrentshack/__init__.py
@@ -1,5 +1,6 @@
from .main import TorrentShack
+
def start():
return TorrentShack()
diff --git a/couchpotato/core/providers/torrent/torrentshack/main.py b/couchpotato/core/providers/torrent/torrentshack/main.py
index 03a5f762..f0cd5997 100644
--- a/couchpotato/core/providers/torrent/torrentshack/main.py
+++ b/couchpotato/core/providers/torrent/torrentshack/main.py
@@ -4,6 +4,7 @@ from couchpotato.core.helpers.variable import tryInt
from couchpotato.core.logger import CPLog
from couchpotato.core.providers.torrent.base import TorrentProvider
import traceback
+import six
log = CPLog(__name__)
@@ -11,12 +12,12 @@ log = CPLog(__name__)
class TorrentShack(TorrentProvider):
urls = {
- 'test' : 'https://torrentshack.net/',
- 'login' : 'https://torrentshack.net/login.php',
+ 'test': 'https://torrentshack.net/',
+ 'login': 'https://torrentshack.net/login.php',
'login_check': 'https://torrentshack.net/inbox.php',
- 'detail' : 'https://torrentshack.net/torrent/%s',
- 'search' : 'https://torrentshack.net/torrents.php?action=advanced&searchstr=%s&scene=%s&filter_cat[%d]=1',
- 'download' : 'https://torrentshack.net/%s',
+ 'detail': 'https://torrentshack.net/torrent/%s',
+ 'search': 'https://torrentshack.net/torrents.php?action=advanced&searchstr=%s&scene=%s&filter_cat[%d]=1',
+ 'download': 'https://torrentshack.net/%s',
}
cat_ids = [
@@ -53,7 +54,7 @@ class TorrentShack(TorrentProvider):
results.append({
'id': link['href'].replace('torrents.php?torrentid=', ''),
- 'name': unicode(link.span.string).translate({ord(u'\xad'): None}),
+ 'name': six.text_type(link.span.string).translate({ord(six.u('\xad')): None}),
'url': self.urls['download'] % url['href'],
'detail_url': self.urls['download'] % link['href'],
'size': self.parseSize(result.find_all('td')[4].string),
diff --git a/couchpotato/core/providers/torrent/yify/__init__.py b/couchpotato/core/providers/torrent/yify/__init__.py
index 99c1162e..3a359608 100644
--- a/couchpotato/core/providers/torrent/yify/__init__.py
+++ b/couchpotato/core/providers/torrent/yify/__init__.py
@@ -1,4 +1,5 @@
-from main import Yify
+from .main import Yify
+
def start():
return Yify()
diff --git a/couchpotato/core/providers/torrent/yify/main.py b/couchpotato/core/providers/torrent/yify/main.py
index 0b5e8b87..6deaf7bb 100644
--- a/couchpotato/core/providers/torrent/yify/main.py
+++ b/couchpotato/core/providers/torrent/yify/main.py
@@ -9,18 +9,19 @@ log = CPLog(__name__)
class Yify(TorrentMagnetProvider):
urls = {
- 'test' : '%s/api',
- 'search' : '%s/api/list.json?keywords=%s&quality=%s',
+ 'test': '%s/api',
+ 'search': '%s/api/list.json?keywords=%s&quality=%s',
'detail': '%s/api/movie.json?id=%s'
}
- http_time_between_calls = 1 #seconds
-
+ http_time_between_calls = 1 #seconds
+
proxy_list = [
- 'https://yify-torrents.im',
'http://yify.unlocktorrent.com',
'http://yify.ftwnet.co.uk',
'http://yify-torrents.com.come.in',
+ 'http://yts.re',
+ 'https://yify-torrents.im',
]
def search(self, movie, quality):
@@ -51,7 +52,7 @@ class Yify(TorrentMagnetProvider):
'id': result['MovieID'],
'name': title,
'url': result['TorrentMagnetUrl'],
- 'detail_url': self.urls['detail'] % (self.getDomain(),result['MovieID']),
+ 'detail_url': self.urls['detail'] % (self.getDomain(), result['MovieID']),
'size': self.parseSize(result['Size']),
'seeders': tryInt(result['TorrentSeeds']),
'leechers': tryInt(result['TorrentPeers'])
@@ -61,4 +62,5 @@ class Yify(TorrentMagnetProvider):
log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
def correctProxy(self, data):
- return 'title="YIFY-Torrents RSS feed"' in data
+ data = data.lower()
+ return 'yify' in data and 'yts' in data
diff --git a/couchpotato/core/providers/trailer/hdtrailers/__init__.py b/couchpotato/core/providers/trailer/hdtrailers/__init__.py
index 016db7a2..83b93004 100644
--- a/couchpotato/core/providers/trailer/hdtrailers/__init__.py
+++ b/couchpotato/core/providers/trailer/hdtrailers/__init__.py
@@ -1,5 +1,6 @@
from .main import HDTrailers
+
def start():
return HDTrailers()
diff --git a/couchpotato/core/providers/trailer/hdtrailers/main.py b/couchpotato/core/providers/trailer/hdtrailers/main.py
index 14b85549..cba7609f 100644
--- a/couchpotato/core/providers/trailer/hdtrailers/main.py
+++ b/couchpotato/core/providers/trailer/hdtrailers/main.py
@@ -29,7 +29,7 @@ class HDTrailers(TrailerProvider):
log.debug('No page found for: %s', movie_name)
data = None
- result_data = {'480p':[], '720p':[], '1080p':[]}
+ result_data = {'480p': [], '720p': [], '1080p': []}
if not data:
return result_data
diff --git a/couchpotato/core/providers/userscript/allocine/__init__.py b/couchpotato/core/providers/userscript/allocine/__init__.py
index e451996f..cb2ba992 100644
--- a/couchpotato/core/providers/userscript/allocine/__init__.py
+++ b/couchpotato/core/providers/userscript/allocine/__init__.py
@@ -1,5 +1,6 @@
from .main import AlloCine
+
def start():
return AlloCine()
diff --git a/couchpotato/core/providers/userscript/appletrailers/__init__.py b/couchpotato/core/providers/userscript/appletrailers/__init__.py
index e8078f47..075217a8 100644
--- a/couchpotato/core/providers/userscript/appletrailers/__init__.py
+++ b/couchpotato/core/providers/userscript/appletrailers/__init__.py
@@ -1,5 +1,6 @@
from .main import AppleTrailers
+
def start():
return AppleTrailers()
diff --git a/couchpotato/core/providers/userscript/criticker/__init__.py b/couchpotato/core/providers/userscript/criticker/__init__.py
index 129d878f..ae24aa1e 100644
--- a/couchpotato/core/providers/userscript/criticker/__init__.py
+++ b/couchpotato/core/providers/userscript/criticker/__init__.py
@@ -1,5 +1,6 @@
from .main import Criticker
+
def start():
return Criticker()
diff --git a/couchpotato/core/providers/userscript/filmweb/__init__.py b/couchpotato/core/providers/userscript/filmweb/__init__.py
index 8ead54d6..3098610c 100644
--- a/couchpotato/core/providers/userscript/filmweb/__init__.py
+++ b/couchpotato/core/providers/userscript/filmweb/__init__.py
@@ -1,5 +1,6 @@
from .main import Filmweb
+
def start():
return Filmweb()
diff --git a/couchpotato/core/providers/userscript/flickchart/__init__.py b/couchpotato/core/providers/userscript/flickchart/__init__.py
index 89d45d9c..18a88ffe 100644
--- a/couchpotato/core/providers/userscript/flickchart/__init__.py
+++ b/couchpotato/core/providers/userscript/flickchart/__init__.py
@@ -1,5 +1,6 @@
from .main import Flickchart
+
def start():
return Flickchart()
diff --git a/couchpotato/core/providers/userscript/imdb/__init__.py b/couchpotato/core/providers/userscript/imdb/__init__.py
index f10505da..c25319b7 100644
--- a/couchpotato/core/providers/userscript/imdb/__init__.py
+++ b/couchpotato/core/providers/userscript/imdb/__init__.py
@@ -1,5 +1,6 @@
from .main import IMDB
+
def start():
return IMDB()
diff --git a/couchpotato/core/providers/userscript/letterboxd/__init__.py b/couchpotato/core/providers/userscript/letterboxd/__init__.py
index c8c17977..2fd89000 100644
--- a/couchpotato/core/providers/userscript/letterboxd/__init__.py
+++ b/couchpotato/core/providers/userscript/letterboxd/__init__.py
@@ -1,5 +1,6 @@
from .main import Letterboxd
+
def start():
return Letterboxd()
diff --git a/couchpotato/core/providers/userscript/moviemeter/__init__.py b/couchpotato/core/providers/userscript/moviemeter/__init__.py
index 5e3813c4..7a05a75a 100644
--- a/couchpotato/core/providers/userscript/moviemeter/__init__.py
+++ b/couchpotato/core/providers/userscript/moviemeter/__init__.py
@@ -1,5 +1,6 @@
from .main import MovieMeter
+
def start():
return MovieMeter()
diff --git a/couchpotato/core/providers/userscript/moviesio/__init__.py b/couchpotato/core/providers/userscript/moviesio/__init__.py
index 473f847d..e29e8d08 100644
--- a/couchpotato/core/providers/userscript/moviesio/__init__.py
+++ b/couchpotato/core/providers/userscript/moviesio/__init__.py
@@ -1,5 +1,6 @@
from .main import MoviesIO
+
def start():
return MoviesIO()
diff --git a/couchpotato/core/providers/userscript/rottentomatoes/__init__.py b/couchpotato/core/providers/userscript/rottentomatoes/__init__.py
index ee8266eb..363f103e 100644
--- a/couchpotato/core/providers/userscript/rottentomatoes/__init__.py
+++ b/couchpotato/core/providers/userscript/rottentomatoes/__init__.py
@@ -1,5 +1,6 @@
from .main import RottenTomatoes
+
def start():
return RottenTomatoes()
diff --git a/couchpotato/core/providers/userscript/sharethe/__init__.py b/couchpotato/core/providers/userscript/sharethe/__init__.py
index 7661f761..3cf393af 100644
--- a/couchpotato/core/providers/userscript/sharethe/__init__.py
+++ b/couchpotato/core/providers/userscript/sharethe/__init__.py
@@ -1,5 +1,6 @@
from .main import ShareThe
+
def start():
return ShareThe()
diff --git a/couchpotato/core/providers/userscript/tmdb/__init__.py b/couchpotato/core/providers/userscript/tmdb/__init__.py
index be33372c..c77330c3 100644
--- a/couchpotato/core/providers/userscript/tmdb/__init__.py
+++ b/couchpotato/core/providers/userscript/tmdb/__init__.py
@@ -1,5 +1,6 @@
from .main import TMDB
+
def start():
return TMDB()
diff --git a/couchpotato/core/providers/userscript/trakt/__init__.py b/couchpotato/core/providers/userscript/trakt/__init__.py
index ff67c1ec..39c17c32 100644
--- a/couchpotato/core/providers/userscript/trakt/__init__.py
+++ b/couchpotato/core/providers/userscript/trakt/__init__.py
@@ -1,5 +1,6 @@
from .main import Trakt
+
def start():
return Trakt()
diff --git a/couchpotato/core/providers/userscript/whiwa/__init__.py b/couchpotato/core/providers/userscript/whiwa/__init__.py
index 6577ae33..c8fd3c9d 100644
--- a/couchpotato/core/providers/userscript/whiwa/__init__.py
+++ b/couchpotato/core/providers/userscript/whiwa/__init__.py
@@ -1,5 +1,6 @@
from .main import WHiWA
+
def start():
return WHiWA()
diff --git a/couchpotato/core/providers/userscript/youteather/__init__.py b/couchpotato/core/providers/userscript/youteather/__init__.py
index a07bf56b..f31e911e 100644
--- a/couchpotato/core/providers/userscript/youteather/__init__.py
+++ b/couchpotato/core/providers/userscript/youteather/__init__.py
@@ -1,5 +1,6 @@
from .main import YouTheater
+
def start():
return YouTheater()
diff --git a/couchpotato/core/settings/__init__.py b/couchpotato/core/settings/__init__.py
index 85dc7a8f..3b575176 100644
--- a/couchpotato/core/settings/__init__.py
+++ b/couchpotato/core/settings/__init__.py
@@ -1,4 +1,5 @@
from __future__ import with_statement
+import traceback
from couchpotato.api import addApiView
from couchpotato.core.event import addEvent, fireEvent
from couchpotato.core.helpers.encoding import toUnicode
@@ -77,7 +78,7 @@ class Settings(object):
self.addSection(section_name)
- for option_name, option in options.iteritems():
+ for option_name, option in options.items():
self.setDefault(section_name, option_name, option.get('default', ''))
# Migrate old settings from old location to the new location
@@ -220,14 +221,20 @@ class Settings(object):
def setProperty(self, identifier, value = ''):
from couchpotato import get_session
- db = get_session()
+ try:
+ db = get_session()
- p = db.query(Properties).filter_by(identifier = identifier).first()
- if not p:
- p = Properties()
- db.add(p)
+ p = db.query(Properties).filter_by(identifier = identifier).first()
+ if not p:
+ p = Properties()
+ db.add(p)
- p.identifier = identifier
- p.value = toUnicode(value)
+ p.identifier = identifier
+ p.value = toUnicode(value)
- db.commit()
+ db.commit()
+ except:
+ self.log.error('Failed: %s', traceback.format_exc())
+ db.rollback()
+ finally:
+ db.close()
diff --git a/couchpotato/core/settings/model.py b/couchpotato/core/settings/model.py
index 8601c2b4..ef6e8a5c 100644
--- a/couchpotato/core/settings/model.py
+++ b/couchpotato/core/settings/model.py
@@ -18,6 +18,7 @@ options_defaults["shortnames"] = True
# http://elixir.ematia.de/trac/wiki/Recipes/MultipleDatabasesOneMetadata
__session__ = None
+
class SetEncoder(json.JSONEncoder):
def default(self, obj):
if isinstance(obj, set):
@@ -40,6 +41,7 @@ class JsonType(TypeDecorator):
def process_result_value(self, value, dialect):
return json.loads(value if value else '{}')
+
class MutableDict(Mutable, dict):
@classmethod
@@ -78,7 +80,7 @@ class Movie(Entity):
such as trailers, nfo, thumbnails"""
last_edit = Field(Integer, default = lambda: int(time.time()), index = True)
- type = 'movie' # Compat tv branch
+ type = 'movie' # Compat tv branch
library = ManyToOne('Library', cascade = 'delete, delete-orphan', single_parent = True)
status = ManyToOne('Status')
@@ -87,7 +89,8 @@ class Movie(Entity):
releases = OneToMany('Release', cascade = 'all, delete-orphan')
files = ManyToMany('File', cascade = 'all, delete-orphan', single_parent = True)
-Media = Movie # Compat tv branch
+Media = Movie # Compat tv branch
+
class Library(Entity):
""""""
@@ -215,6 +218,7 @@ class Profile(Entity):
return orig_dict
+
class Category(Entity):
""""""
using_options(order_by = 'order')
diff --git a/couchpotato/environment.py b/couchpotato/environment.py
index b393ef94..1c5863d1 100644
--- a/couchpotato/environment.py
+++ b/couchpotato/environment.py
@@ -2,10 +2,10 @@ from couchpotato.core.event import fireEvent, addEvent
from couchpotato.core.loader import Loader
from couchpotato.core.settings import Settings
from sqlalchemy.engine import create_engine
-from sqlalchemy.orm import scoped_session
from sqlalchemy.orm.session import sessionmaker
import os
+
class Env(object):
_appname = 'CouchPotato'
@@ -23,7 +23,7 @@ class Env(object):
_quiet = False
_daemonized = False
_desktop = None
- _session = None
+ _engine = None
''' Data paths and directories '''
_app_dir = ""
@@ -53,20 +53,20 @@ class Env(object):
return setattr(Env, '_' + attr, value)
@staticmethod
- def getSession(engine = None):
- existing_session = Env.get('session')
- if existing_session:
- return existing_session
-
- engine = Env.getEngine()
- session = scoped_session(sessionmaker(bind = engine))
- Env.set('session', session)
-
- return session
+ def getSession():
+ session = sessionmaker(bind = Env.getEngine())
+ return session()
@staticmethod
def getEngine():
- return create_engine(Env.get('db_path'), echo = False, pool_recycle = 30)
+ existing_engine = Env.get('engine')
+ if existing_engine:
+ return existing_engine
+
+ engine = create_engine(Env.get('db_path'), echo = False)
+ Env.set('engine', engine)
+
+ return engine
@staticmethod
def setting(attr, section = 'core', value = None, default = '', type = None):
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
index 36d43564..5c175201 100644
--- a/couchpotato/runner.py
+++ b/couchpotato/runner.py
@@ -18,6 +18,7 @@ import time
import traceback
import warnings
+
def getOptions(base_path, args):
# Options
@@ -52,6 +53,7 @@ def getOptions(base_path, args):
return options
+
# Tornado monkey patch logging..
def _log(status_code, request):
@@ -121,7 +123,6 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
os.rmdir(backup)
total_backups -= 1
-
# Register environment settings
Env.set('app_dir', toUnicode(base_path))
Env.set('data_dir', toUnicode(data_dir))
@@ -234,10 +235,9 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
'ssl_key': Env.setting('ssl_key', default = None),
}
-
# Load the app
application = Application([],
- log_function = lambda x : None,
+ log_function = lambda x: None,
debug = config['use_reloader'],
gzip = True,
cookie_secret = api_key,
@@ -250,9 +250,9 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
(r'%snonblock/(.*)(/?)' % api_base, NonBlockHandler),
# API handlers
- (r'%s(.*)(/?)' % api_base, ApiHandler), # Main API handler
- (r'%sgetkey(/?)' % web_base, KeyHandler), # Get API key
- (r'%s' % api_base, RedirectHandler, {"url": web_base + 'docs/'}), # API docs
+ (r'%s(.*)(/?)' % api_base, ApiHandler), # Main API handler
+ (r'%sgetkey(/?)' % web_base, KeyHandler), # Get API key
+ (r'%s' % api_base, RedirectHandler, {"url": web_base + 'docs/'}), # API docs
# Login handlers
(r'%slogin(/?)' % web_base, LoginHandler),
@@ -267,37 +267,32 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
static_path = '%sstatic/' % web_base
for dir_name in ['fonts', 'images', 'scripts', 'style']:
application.add_handlers(".*$", [
- ('%s%s/(.*)' % (static_path, dir_name), StaticFileHandler, {'path': toUnicode(os.path.join(base_path, 'couchpotato', 'static', dir_name))})
+ ('%s%s/(.*)' % (static_path, dir_name), StaticFileHandler, {'path': toUnicode(os.path.join(base_path, 'couchpotato', 'static', dir_name))})
])
Env.set('static_path', static_path)
-
# Load configs & plugins
loader = Env.get('loader')
loader.preload(root = toUnicode(base_path))
loader.run()
-
# Fill database with needed stuff
if not db_exists:
fireEvent('app.initialize', in_order = True)
-
# Go go go!
from tornado.ioloop import IOLoop
loop = IOLoop.current()
-
# Some logging and fire load event
try: log.info('Starting server on port %(port)s', config)
except: pass
fireEventAsync('app.load')
-
if config['ssl_cert'] and config['ssl_key']:
server = HTTPServer(application, no_keep_alive = True, ssl_options = {
- "certfile": config['ssl_cert'],
- "keyfile": config['ssl_key'],
+ 'certfile': config['ssl_cert'],
+ 'keyfile': config['ssl_key'],
})
else:
server = HTTPServer(application, no_keep_alive = True)
@@ -309,7 +304,7 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
try:
server.listen(config['port'], config['host'])
loop.start()
- except Exception, e:
+ except Exception as e:
log.error('Failed starting: %s', traceback.format_exc())
try:
nr, msg = e
diff --git a/couchpotato/static/scripts/couchpotato.js b/couchpotato/static/scripts/couchpotato.js
index eae865f4..03332281 100644
--- a/couchpotato/static/scripts/couchpotato.js
+++ b/couchpotato/static/scripts/couchpotato.js
@@ -364,7 +364,7 @@
if(!on_complete && typeOf(args) == 'function'){
on_complete = args;
- args = {};
+ args = [];
}
// Create parallel callback
@@ -372,7 +372,7 @@
self.global_events[name].each(function(handle, nr){
callbacks.push(function(callback){
- var results = handle(args || {});
+ var results = handle.apply(handle, args || []);
callback(null, results || null);
});
@@ -593,4 +593,4 @@ var createSpinner = function(target, options){
}, options);
return new Spinner(opts).spin(target);
-};
\ No newline at end of file
+};
diff --git a/couchpotato/static/scripts/page/manage.js b/couchpotato/static/scripts/page/manage.js
index eeeef628..ed9120fa 100644
--- a/couchpotato/static/scripts/page/manage.js
+++ b/couchpotato/static/scripts/page/manage.js
@@ -119,7 +119,9 @@ Page.Manage = new Class({
sorted_table.each(function(folder){
var folder_progress = progress[folder]
new Element('div').adopt(
- new Element('span.folder', {'text': folder}),
+ new Element('span.folder', {'text': folder +
+ (folder_progress.eta > 0 ? ', ' + new Date ().increment('second', folder_progress.eta).timeDiffInWords().replace('from now', 'to go') : '')
+ }),
new Element('span.percentage', {'text': folder_progress.total ? (((folder_progress.total-folder_progress.to_go)/folder_progress.total)*100).round() + '%' : '0%'})
).inject(self.progress_container)
});
diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js
index ba97bcd0..9c9453e0 100644
--- a/couchpotato/static/scripts/page/settings.js
+++ b/couchpotato/static/scripts/page/settings.js
@@ -118,20 +118,18 @@ Page.Settings = new Class({
create: function(json){
var self = this;
- self.el.adopt(
- self.tabs_container = new Element('ul.tabs'),
- self.containers = new Element('form.uniForm.containers').adopt(
- new Element('label.advanced_toggle').adopt(
- new Element('span', {
- 'text': 'Show advanced settings'
- }),
- self.advanced_toggle = new Element('input[type=checkbox].inlay', {
- 'checked': +Cookie.read('advanced_toggle_checked'),
- 'events': {
- 'change': self.showAdvanced.bind(self)
- }
- })
- )
+ self.tabs_container = new Element('ul.tabs');
+ self.containers = new Element('form.uniForm.containers').adopt(
+ new Element('label.advanced_toggle').adopt(
+ new Element('span', {
+ 'text': 'Show advanced settings'
+ }),
+ self.advanced_toggle = new Element('input[type=checkbox].inlay', {
+ 'checked': +Cookie.read('advanced_toggle_checked'),
+ 'events': {
+ 'change': self.showAdvanced.bind(self)
+ }
+ })
)
);
self.showAdvanced();
@@ -197,8 +195,15 @@ Page.Settings = new Class({
});
});
- self.fireEvent('create');
- self.openTab();
+ setTimeout(function(){
+ self.fireEvent('create');
+ self.openTab();
+
+ self.el.adopt(
+ self.tabs_container,
+ self.containers
+ );
+ }, 0);
},
diff --git a/libs/apscheduler/__init__.py b/libs/apscheduler/__init__.py
index d93e1b3b..71cc53db 100644
--- a/libs/apscheduler/__init__.py
+++ b/libs/apscheduler/__init__.py
@@ -1,3 +1,3 @@
-version_info = (2, 1, 1)
+version_info = (2, 1, 2)
version = '.'.join(str(n) for n in version_info[:3])
release = '.'.join(str(n) for n in version_info)
diff --git a/libs/apscheduler/jobstores/shelve_store.py b/libs/apscheduler/jobstores/shelve_store.py
index bd68333f..d1be58f9 100644
--- a/libs/apscheduler/jobstores/shelve_store.py
+++ b/libs/apscheduler/jobstores/shelve_store.py
@@ -21,7 +21,10 @@ class ShelveJobStore(JobStore):
self.jobs = []
self.path = path
self.pickle_protocol = pickle_protocol
- self.store = shelve.open(path, 'c', self.pickle_protocol)
+ self._open_store()
+
+ def _open_store(self):
+ self.store = shelve.open(self.path, 'c', self.pickle_protocol)
def _generate_id(self):
id = None
@@ -33,7 +36,8 @@ class ShelveJobStore(JobStore):
def add_job(self, job):
job.id = self._generate_id()
self.store[job.id] = job.__getstate__()
- self.store.sync()
+ self.store.close()
+ self._open_store()
self.jobs.append(job)
def update_job(self, job):
@@ -41,11 +45,13 @@ class ShelveJobStore(JobStore):
job_dict['next_run_time'] = job.next_run_time
job_dict['runs'] = job.runs
self.store[job.id] = job_dict
- self.store.sync()
+ self.store.close()
+ self._open_store()
def remove_job(self, job):
del self.store[job.id]
- self.store.sync()
+ self.store.close()
+ self._open_store()
self.jobs.remove(job)
def load_jobs(self):
diff --git a/libs/apscheduler/scheduler.py b/libs/apscheduler/scheduler.py
index d6afcad2..319037a9 100644
--- a/libs/apscheduler/scheduler.py
+++ b/libs/apscheduler/scheduler.py
@@ -586,7 +586,10 @@ class Scheduler(object):
wait_seconds = time_difference(next_wakeup_time, now)
logger.debug('Next wakeup is due at %s (in %f seconds)',
next_wakeup_time, wait_seconds)
- self._wakeup.wait(wait_seconds)
+ try:
+ self._wakeup.wait(wait_seconds)
+ except IOError: # Catch errno 514 on some Linux kernels
+ pass
self._wakeup.clear()
elif self.standalone:
logger.debug('No jobs left; shutting down scheduler')
@@ -594,7 +597,10 @@ class Scheduler(object):
break
else:
logger.debug('No jobs; waiting until a job is added')
- self._wakeup.wait()
+ try:
+ self._wakeup.wait()
+ except IOError: # Catch errno 514 on some Linux kernels
+ pass
self._wakeup.clear()
logger.info('Scheduler has been shut down')
diff --git a/libs/html5lib/__init__.py b/libs/html5lib/__init__.py
index 66c1a8eb..19a4b7d6 100644
--- a/libs/html5lib/__init__.py
+++ b/libs/html5lib/__init__.py
@@ -20,4 +20,4 @@ from .serializer import serialize
__all__ = ["HTMLParser", "parse", "parseFragment", "getTreeBuilder",
"getTreeWalker", "serialize"]
-__version__ = "0.99"
+__version__ = "0.999"
diff --git a/libs/html5lib/inputstream.py b/libs/html5lib/inputstream.py
index 004bdd4a..9e03b931 100644
--- a/libs/html5lib/inputstream.py
+++ b/libs/html5lib/inputstream.py
@@ -1,5 +1,6 @@
from __future__ import absolute_import, division, unicode_literals
from six import text_type
+from six.moves import http_client
import codecs
import re
@@ -118,7 +119,11 @@ class BufferedStream(object):
def HTMLInputStream(source, encoding=None, parseMeta=True, chardet=True):
- if hasattr(source, "read"):
+ if isinstance(source, http_client.HTTPResponse):
+ # Work around Python bug #20007: read(0) closes the connection.
+ # http://bugs.python.org/issue20007
+ isUnicode = False
+ elif hasattr(source, "read"):
isUnicode = isinstance(source.read(0), text_type)
else:
isUnicode = isinstance(source, text_type)
diff --git a/libs/html5lib/treebuilders/__init__.py b/libs/html5lib/treebuilders/__init__.py
old mode 100755
new mode 100644
diff --git a/libs/html5lib/treebuilders/_base.py b/libs/html5lib/treebuilders/_base.py
old mode 100755
new mode 100644
diff --git a/libs/html5lib/treebuilders/etree.py b/libs/html5lib/treebuilders/etree.py
old mode 100755
new mode 100644
diff --git a/libs/html5lib/treewalkers/lxmletree.py b/libs/html5lib/treewalkers/lxmletree.py
index 375cc2e8..bc934ac0 100644
--- a/libs/html5lib/treewalkers/lxmletree.py
+++ b/libs/html5lib/treewalkers/lxmletree.py
@@ -87,10 +87,6 @@ class FragmentWrapper(object):
self.tail = ensure_str(self.obj.tail)
else:
self.tail = None
- self.isstring = isinstance(obj, str) or isinstance(obj, bytes)
- # Support for bytes here is Py2
- if self.isstring:
- self.obj = ensure_str(self.obj)
def __getattr__(self, name):
return getattr(self.obj, name)
@@ -143,7 +139,7 @@ class TreeWalker(_base.NonRecursiveTreeWalker):
elif isinstance(node, Doctype):
return _base.DOCTYPE, node.name, node.public_id, node.system_id
- elif isinstance(node, FragmentWrapper) and node.isstring:
+ elif isinstance(node, FragmentWrapper) and not hasattr(node, "tag"):
return _base.TEXT, node.obj
elif node.tag == etree.Comment:
diff --git a/libs/importhelper/__init__.py b/libs/importhelper/__init__.py
new file mode 100644
index 00000000..ad31a1ac
--- /dev/null
+++ b/libs/importhelper/__init__.py
@@ -0,0 +1,38 @@
+"""Backport of importlib.import_module from 3.x."""
+# While not critical (and in no way guaranteed!), it would be nice to keep this
+# code compatible with Python 2.3.
+import sys
+
+def _resolve_name(name, package, level):
+ """Return the absolute name of the module to be imported."""
+ if not hasattr(package, 'rindex'):
+ raise ValueError("'package' not set to a string")
+ dot = len(package)
+ for x in xrange(level, 1, -1):
+ try:
+ dot = package.rindex('.', 0, dot)
+ except ValueError:
+ raise ValueError("attempted relative import beyond top-level "
+ "package")
+ return "%s.%s" % (package[:dot], name)
+
+
+def import_module(name, package=None):
+ """Import a module.
+
+ The 'package' argument is required when performing a relative import. It
+ specifies the package to use as the anchor point from which to resolve the
+ relative import to an absolute import.
+
+ """
+ if name.startswith('.'):
+ if not package:
+ raise TypeError("relative imports require the 'package' argument")
+ level = 0
+ for character in name:
+ if character != '.':
+ break
+ level += 1
+ name = _resolve_name(name[level:], package, level)
+ __import__(name)
+ return sys.modules[name]
diff --git a/libs/rtorrent/__init__.py b/libs/rtorrent/__init__.py
index 683ef1c7..2c0f3fa9 100755
--- a/libs/rtorrent/__init__.py
+++ b/libs/rtorrent/__init__.py
@@ -199,7 +199,7 @@ class RTorrent:
return(func_name)
- def load_torrent(self, torrent, start=False, verbose=False, verify_load=True):
+ def load_torrent(self, torrent, start=False, verbose=False, verify_load=True, verify_retries=3):
"""
Loads torrent into rTorrent (with various enhancements)
@@ -244,9 +244,8 @@ class RTorrent:
getattr(p, func_name)(torrent)
if verify_load:
- MAX_RETRIES = 3
i = 0
- while i < MAX_RETRIES:
+ while i < verify_retries:
self.get_torrents()
if info_hash in [t.info_hash for t in self.torrents]:
break
diff --git a/libs/rtorrent/lib/bencode.py b/libs/rtorrent/lib/bencode.py
index 97bd2f0e..ba99ef93 100755
--- a/libs/rtorrent/lib/bencode.py
+++ b/libs/rtorrent/lib/bencode.py
@@ -267,7 +267,7 @@ def _encode_dict(data):
def encode(data):
if isinstance(data, bool):
return False
- elif isinstance(data, int):
+ elif isinstance(data, (int, long)):
return _encode_int(data)
elif isinstance(data, bytes):
return _encode_string(data)
diff --git a/libs/rtorrent/lib/torrentparser.py b/libs/rtorrent/lib/torrentparser.py
index 30170d32..b339bce4 100755
--- a/libs/rtorrent/lib/torrentparser.py
+++ b/libs/rtorrent/lib/torrentparser.py
@@ -90,10 +90,10 @@ class TorrentParser():
def _calc_info_hash(self):
self.info_hash = None
if "info" in self._torrent_decoded.keys():
- info_encoded = bencode.encode(self._torrent_decoded["info"])
+ info_encoded = bencode.encode(self._torrent_decoded["info"])
- if info_encoded:
- self.info_hash = hashlib.sha1(info_encoded).hexdigest().upper()
+ if info_encoded:
+ self.info_hash = hashlib.sha1(info_encoded).hexdigest().upper()
return(self.info_hash)
diff --git a/libs/six.py b/libs/six.py
index a91961ec..7ec7f1be 100644
--- a/libs/six.py
+++ b/libs/six.py
@@ -1,14 +1,35 @@
"""Utilities for writing code that runs on Python 2 and 3"""
+# Copyright (c) 2010-2014 Benjamin Peterson
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
import operator
import sys
import types
__author__ = "Benjamin Peterson "
-__version__ = "1.2.0"
+__version__ = "1.5.2"
-# True if we are running on Python 3.
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
PY3 = sys.version_info[0] == 3
if PY3:
@@ -26,7 +47,7 @@ else:
text_type = unicode
binary_type = str
- if sys.platform == "java":
+ if sys.platform.startswith("java"):
# Jython always uses 32 bits.
MAXSIZE = int((1 << 31) - 1)
else:
@@ -42,7 +63,7 @@ else:
else:
# 64-bit
MAXSIZE = int((1 << 63) - 1)
- del X
+ del X
def _add_doc(func, doc):
@@ -63,9 +84,9 @@ class _LazyDescr(object):
def __get__(self, obj, tp):
result = self._resolve()
- setattr(obj, self.name, result)
+ setattr(obj, self.name, result) # Invokes __set__.
# This is a bit ugly, but it avoids running this again.
- delattr(tp, self.name)
+ delattr(obj.__class__, self.name)
return result
@@ -83,6 +104,35 @@ class MovedModule(_LazyDescr):
def _resolve(self):
return _import_module(self.mod)
+ def __getattr__(self, attr):
+ # Hack around the Django autoreloader. The reloader tries to get
+ # __file__ or __name__ of every module in sys.modules. This doesn't work
+ # well if this MovedModule is for an module that is unavailable on this
+ # machine (like winreg on Unix systems). Thus, we pretend __file__ and
+ # __name__ don't exist if the module hasn't been loaded yet. See issues
+ # #51 and #53.
+ if attr in ("__file__", "__name__") and self.mod not in sys.modules:
+ raise AttributeError
+ _module = self._resolve()
+ value = getattr(_module, attr)
+ setattr(self, attr, value)
+ return value
+
+
+class _LazyModule(types.ModuleType):
+
+ def __init__(self, name):
+ super(_LazyModule, self).__init__(name)
+ self.__doc__ = self.__class__.__doc__
+
+ def __dir__(self):
+ attrs = ["__doc__", "__name__"]
+ attrs += [attr.name for attr in self._moved_attributes]
+ return attrs
+
+ # Subclasses should override this
+ _moved_attributes = []
+
class MovedAttribute(_LazyDescr):
@@ -110,29 +160,37 @@ class MovedAttribute(_LazyDescr):
-class _MovedItems(types.ModuleType):
+class _MovedItems(_LazyModule):
"""Lazy loading of moved objects"""
_moved_attributes = [
MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+ MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+ MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
MovedAttribute("reduce", "__builtin__", "functools"),
MovedAttribute("StringIO", "StringIO", "io"),
+ MovedAttribute("UserString", "UserString", "collections"),
MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+ MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
MovedModule("builtins", "__builtin__"),
MovedModule("configparser", "ConfigParser"),
MovedModule("copyreg", "copy_reg"),
+ MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
MovedModule("http_cookies", "Cookie", "http.cookies"),
MovedModule("html_entities", "htmlentitydefs", "html.entities"),
MovedModule("html_parser", "HTMLParser", "html.parser"),
MovedModule("http_client", "httplib", "http.client"),
+ MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+ MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+ MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
@@ -140,12 +198,14 @@ _moved_attributes = [
MovedModule("queue", "Queue"),
MovedModule("reprlib", "repr"),
MovedModule("socketserver", "SocketServer"),
+ MovedModule("_thread", "thread", "_thread"),
MovedModule("tkinter", "Tkinter"),
MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+ MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
MovedModule("tkinter_colorchooser", "tkColorChooser",
@@ -157,14 +217,167 @@ _moved_attributes = [
MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
"tkinter.simpledialog"),
+ MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
+ MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
+ MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+ MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
MovedModule("winreg", "_winreg"),
]
for attr in _moved_attributes:
setattr(_MovedItems, attr.name, attr)
+ if isinstance(attr, MovedModule):
+ sys.modules[__name__ + ".moves." + attr.name] = attr
del attr
-moves = sys.modules["six.moves"] = _MovedItems("moves")
+_MovedItems._moved_attributes = _moved_attributes
+
+moves = sys.modules[__name__ + ".moves"] = _MovedItems(__name__ + ".moves")
+
+
+class Module_six_moves_urllib_parse(_LazyModule):
+ """Lazy loading of moved objects in six.moves.urllib_parse"""
+
+
+_urllib_parse_moved_attributes = [
+ MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
+ MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
+ MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
+ MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
+ MovedAttribute("urljoin", "urlparse", "urllib.parse"),
+ MovedAttribute("urlparse", "urlparse", "urllib.parse"),
+ MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
+ MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
+ MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
+ MovedAttribute("quote", "urllib", "urllib.parse"),
+ MovedAttribute("quote_plus", "urllib", "urllib.parse"),
+ MovedAttribute("unquote", "urllib", "urllib.parse"),
+ MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+ MovedAttribute("urlencode", "urllib", "urllib.parse"),
+]
+for attr in _urllib_parse_moved_attributes:
+ setattr(Module_six_moves_urllib_parse, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
+
+sys.modules[__name__ + ".moves.urllib_parse"] = sys.modules[__name__ + ".moves.urllib.parse"] = Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse")
+
+
+class Module_six_moves_urllib_error(_LazyModule):
+ """Lazy loading of moved objects in six.moves.urllib_error"""
+
+
+_urllib_error_moved_attributes = [
+ MovedAttribute("URLError", "urllib2", "urllib.error"),
+ MovedAttribute("HTTPError", "urllib2", "urllib.error"),
+ MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
+]
+for attr in _urllib_error_moved_attributes:
+ setattr(Module_six_moves_urllib_error, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
+
+sys.modules[__name__ + ".moves.urllib_error"] = sys.modules[__name__ + ".moves.urllib.error"] = Module_six_moves_urllib_error(__name__ + ".moves.urllib.error")
+
+
+class Module_six_moves_urllib_request(_LazyModule):
+ """Lazy loading of moved objects in six.moves.urllib_request"""
+
+
+_urllib_request_moved_attributes = [
+ MovedAttribute("urlopen", "urllib2", "urllib.request"),
+ MovedAttribute("install_opener", "urllib2", "urllib.request"),
+ MovedAttribute("build_opener", "urllib2", "urllib.request"),
+ MovedAttribute("pathname2url", "urllib", "urllib.request"),
+ MovedAttribute("url2pathname", "urllib", "urllib.request"),
+ MovedAttribute("getproxies", "urllib", "urllib.request"),
+ MovedAttribute("Request", "urllib2", "urllib.request"),
+ MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
+ MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
+ MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
+ MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
+ MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
+ MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
+ MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
+ MovedAttribute("FileHandler", "urllib2", "urllib.request"),
+ MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
+ MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
+ MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
+ MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
+ MovedAttribute("urlretrieve", "urllib", "urllib.request"),
+ MovedAttribute("urlcleanup", "urllib", "urllib.request"),
+ MovedAttribute("URLopener", "urllib", "urllib.request"),
+ MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+ MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
+]
+for attr in _urllib_request_moved_attributes:
+ setattr(Module_six_moves_urllib_request, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
+
+sys.modules[__name__ + ".moves.urllib_request"] = sys.modules[__name__ + ".moves.urllib.request"] = Module_six_moves_urllib_request(__name__ + ".moves.urllib.request")
+
+
+class Module_six_moves_urllib_response(_LazyModule):
+ """Lazy loading of moved objects in six.moves.urllib_response"""
+
+
+_urllib_response_moved_attributes = [
+ MovedAttribute("addbase", "urllib", "urllib.response"),
+ MovedAttribute("addclosehook", "urllib", "urllib.response"),
+ MovedAttribute("addinfo", "urllib", "urllib.response"),
+ MovedAttribute("addinfourl", "urllib", "urllib.response"),
+]
+for attr in _urllib_response_moved_attributes:
+ setattr(Module_six_moves_urllib_response, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
+
+sys.modules[__name__ + ".moves.urllib_response"] = sys.modules[__name__ + ".moves.urllib.response"] = Module_six_moves_urllib_response(__name__ + ".moves.urllib.response")
+
+
+class Module_six_moves_urllib_robotparser(_LazyModule):
+ """Lazy loading of moved objects in six.moves.urllib_robotparser"""
+
+
+_urllib_robotparser_moved_attributes = [
+ MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
+]
+for attr in _urllib_robotparser_moved_attributes:
+ setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
+
+sys.modules[__name__ + ".moves.urllib_robotparser"] = sys.modules[__name__ + ".moves.urllib.robotparser"] = Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser")
+
+
+class Module_six_moves_urllib(types.ModuleType):
+ """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
+ parse = sys.modules[__name__ + ".moves.urllib_parse"]
+ error = sys.modules[__name__ + ".moves.urllib_error"]
+ request = sys.modules[__name__ + ".moves.urllib_request"]
+ response = sys.modules[__name__ + ".moves.urllib_response"]
+ robotparser = sys.modules[__name__ + ".moves.urllib_robotparser"]
+
+ def __dir__(self):
+ return ['parse', 'error', 'request', 'response', 'robotparser']
+
+
+sys.modules[__name__ + ".moves.urllib"] = Module_six_moves_urllib(__name__ + ".moves.urllib")
def add_move(move):
@@ -187,22 +400,28 @@ if PY3:
_meth_func = "__func__"
_meth_self = "__self__"
+ _func_closure = "__closure__"
_func_code = "__code__"
_func_defaults = "__defaults__"
+ _func_globals = "__globals__"
_iterkeys = "keys"
_itervalues = "values"
_iteritems = "items"
+ _iterlists = "lists"
else:
_meth_func = "im_func"
_meth_self = "im_self"
+ _func_closure = "func_closure"
_func_code = "func_code"
_func_defaults = "func_defaults"
+ _func_globals = "func_globals"
_iterkeys = "iterkeys"
_itervalues = "itervalues"
_iteritems = "iteritems"
+ _iterlists = "iterlists"
try:
@@ -213,18 +432,27 @@ except NameError:
next = advance_iterator
+try:
+ callable = callable
+except NameError:
+ def callable(obj):
+ return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
if PY3:
def get_unbound_function(unbound):
return unbound
- Iterator = object
+ create_bound_method = types.MethodType
- def callable(obj):
- return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+ Iterator = object
else:
def get_unbound_function(unbound):
return unbound.im_func
+ def create_bound_method(func, obj):
+ return types.MethodType(func, obj, obj.__class__)
+
class Iterator(object):
def next(self):
@@ -237,21 +465,27 @@ _add_doc(get_unbound_function,
get_method_function = operator.attrgetter(_meth_func)
get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
get_function_code = operator.attrgetter(_func_code)
get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
-def iterkeys(d):
+def iterkeys(d, **kw):
"""Return an iterator over the keys of a dictionary."""
- return iter(getattr(d, _iterkeys)())
+ return iter(getattr(d, _iterkeys)(**kw))
-def itervalues(d):
+def itervalues(d, **kw):
"""Return an iterator over the values of a dictionary."""
- return iter(getattr(d, _itervalues)())
+ return iter(getattr(d, _itervalues)(**kw))
-def iteritems(d):
+def iteritems(d, **kw):
"""Return an iterator over the (key, value) pairs of a dictionary."""
- return iter(getattr(d, _iteritems)())
+ return iter(getattr(d, _iteritems)(**kw))
+
+def iterlists(d, **kw):
+ """Return an iterator over the (key, [values]) pairs of a dictionary."""
+ return iter(getattr(d, _iterlists)(**kw))
if PY3:
@@ -259,21 +493,33 @@ if PY3:
return s.encode("latin-1")
def u(s):
return s
+ unichr = chr
if sys.version_info[1] <= 1:
def int2byte(i):
return bytes((i,))
else:
# This is about 2x faster than the implementation above on 3.2+
int2byte = operator.methodcaller("to_bytes", 1, "big")
+ byte2int = operator.itemgetter(0)
+ indexbytes = operator.getitem
+ iterbytes = iter
import io
StringIO = io.StringIO
BytesIO = io.BytesIO
else:
def b(s):
return s
+ # Workaround for standalone backslash
def u(s):
- return unicode(s, "unicode_escape")
+ return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
+ unichr = unichr
int2byte = chr
+ def byte2int(bs):
+ return ord(bs[0])
+ def indexbytes(buf, i):
+ return ord(buf[i])
+ def iterbytes(buf):
+ return (ord(byte) for byte in buf)
import StringIO
StringIO = BytesIO = StringIO.StringIO
_add_doc(b, """Byte literal""")
@@ -281,8 +527,7 @@ _add_doc(u, """Text literal""")
if PY3:
- import builtins
- exec_ = getattr(builtins, "exec")
+ exec_ = getattr(moves.builtins, "exec")
def reraise(tp, value, tb=None):
@@ -290,22 +535,18 @@ if PY3:
raise value.with_traceback(tb)
raise value
-
- print_ = getattr(builtins, "print")
- del builtins
-
else:
- def exec_(code, globs=None, locs=None):
+ def exec_(_code_, _globs_=None, _locs_=None):
"""Execute code in a namespace."""
- if globs is None:
+ if _globs_ is None:
frame = sys._getframe(1)
- globs = frame.f_globals
- if locs is None:
- locs = frame.f_locals
+ _globs_ = frame.f_globals
+ if _locs_ is None:
+ _locs_ = frame.f_locals
del frame
- elif locs is None:
- locs = globs
- exec("""exec code in globs, locs""")
+ elif _locs_ is None:
+ _locs_ = _globs_
+ exec("""exec _code_ in _globs_, _locs_""")
exec_("""def reraise(tp, value, tb=None):
@@ -313,14 +554,24 @@ else:
""")
+print_ = getattr(moves.builtins, "print", None)
+if print_ is None:
def print_(*args, **kwargs):
- """The new-style print function."""
+ """The new-style print function for Python 2.4 and 2.5."""
fp = kwargs.pop("file", sys.stdout)
if fp is None:
return
def write(data):
if not isinstance(data, basestring):
data = str(data)
+ # If the file has an encoding, encode unicode with it.
+ if (isinstance(fp, file) and
+ isinstance(data, unicode) and
+ fp.encoding is not None):
+ errors = getattr(fp, "errors", None)
+ if errors is None:
+ errors = "strict"
+ data = data.encode(fp.encoding, errors)
fp.write(data)
want_unicode = False
sep = kwargs.pop("sep", None)
@@ -361,6 +612,21 @@ else:
_add_doc(reraise, """Reraise an exception.""")
-def with_metaclass(meta, base=object):
+def with_metaclass(meta, *bases):
"""Create a base class with a metaclass."""
- return meta("NewBase", (base,), {})
+ return meta("NewBase", bases, {})
+
+def add_metaclass(metaclass):
+ """Class decorator for creating a class with a metaclass."""
+ def wrapper(cls):
+ orig_vars = cls.__dict__.copy()
+ orig_vars.pop('__dict__', None)
+ orig_vars.pop('__weakref__', None)
+ slots = orig_vars.get('__slots__')
+ if slots is not None:
+ if isinstance(slots, str):
+ slots = [slots]
+ for slots_var in slots:
+ orig_vars.pop(slots_var)
+ return metaclass(cls.__name__, cls.__bases__, orig_vars)
+ return wrapper
diff --git a/libs/tornado/__init__.py b/libs/tornado/__init__.py
index bec636f3..c41ec97b 100755
--- a/libs/tornado/__init__.py
+++ b/libs/tornado/__init__.py
@@ -25,5 +25,5 @@ from __future__ import absolute_import, division, print_function, with_statement
# is zero for an official release, positive for a development branch,
# or negative for a release candidate or beta (after the base version
# number has been incremented)
-version = "3.2b1"
-version_info = (3, 2, 0, -98)
+version = "3.2"
+version_info = (3, 2, 0, 0)
diff --git a/libs/tornado/auth.py b/libs/tornado/auth.py
index f2080f1e..9baac9ba 100755
--- a/libs/tornado/auth.py
+++ b/libs/tornado/auth.py
@@ -36,7 +36,6 @@ Example usage for Google OpenID::
class GoogleLoginHandler(tornado.web.RequestHandler,
tornado.auth.GoogleMixin):
- @tornado.web.asynchronous
@tornado.gen.coroutine
def get(self):
if self.get_argument("openid.mode", None):
@@ -607,7 +606,6 @@ class TwitterMixin(OAuthMixin):
class TwitterLoginHandler(tornado.web.RequestHandler,
tornado.auth.TwitterMixin):
- @tornado.web.asynchronous
@tornado.gen.coroutine
def get(self):
if self.get_argument("oauth_token", None):
@@ -669,7 +667,6 @@ class TwitterMixin(OAuthMixin):
class MainHandler(tornado.web.RequestHandler,
tornado.auth.TwitterMixin):
@tornado.web.authenticated
- @tornado.web.asynchronous
@tornado.gen.coroutine
def get(self):
new_entry = yield self.twitter_request(
@@ -748,7 +745,6 @@ class FriendFeedMixin(OAuthMixin):
class FriendFeedLoginHandler(tornado.web.RequestHandler,
tornado.auth.FriendFeedMixin):
- @tornado.web.asynchronous
@tornado.gen.coroutine
def get(self):
if self.get_argument("oauth_token", None):
@@ -793,7 +789,6 @@ class FriendFeedMixin(OAuthMixin):
class MainHandler(tornado.web.RequestHandler,
tornado.auth.FriendFeedMixin):
@tornado.web.authenticated
- @tornado.web.asynchronous
@tornado.gen.coroutine
def get(self):
new_entry = yield self.friendfeed_request(
@@ -877,7 +872,6 @@ class GoogleMixin(OpenIdMixin, OAuthMixin):
class GoogleLoginHandler(tornado.web.RequestHandler,
tornado.auth.GoogleMixin):
- @tornado.web.asynchronous
@tornado.gen.coroutine
def get(self):
if self.get_argument("openid.mode", None):
@@ -949,7 +943,10 @@ class GoogleMixin(OpenIdMixin, OAuthMixin):
class GoogleOAuth2Mixin(OAuth2Mixin):
- """Google authentication using OAuth2."""
+ """Google authentication using OAuth2.
+
+ .. versionadded:: 3.2
+ """
_OAUTH_AUTHORIZE_URL = "https://accounts.google.com/o/oauth2/auth"
_OAUTH_ACCESS_TOKEN_URL = "https://accounts.google.com/o/oauth2/token"
_OAUTH_NO_CALLBACKS = False
@@ -961,22 +958,22 @@ class GoogleOAuth2Mixin(OAuth2Mixin):
Example usage::
- class GoogleOAuth2LoginHandler(LoginHandler, tornado.auth.GoogleOAuth2Mixin):
- @tornado.web.asynchronous
+ class GoogleOAuth2LoginHandler(LoginHandler,
+ tornado.auth.GoogleOAuth2Mixin):
@tornado.gen.coroutine
def get(self):
- if self.get_argument("code", False):
+ if self.get_argument('code', False):
user = yield self.get_authenticated_user(
redirect_uri='http://your.site.com/auth/google',
- code=self.get_argument("code"))
+ code=self.get_argument('code'))
# Save the user with e.g. set_secure_cookie
else:
yield self.authorize_redirect(
redirect_uri='http://your.site.com/auth/google',
- client_id=self.settings["google_consumer_key"],
- scope=['openid', 'email'],
+ client_id=self.settings['google_oauth']['key'],
+ scope=['profile', 'email'],
response_type='code',
- extra_params={"approval_prompt": "auto"})
+ extra_params={'approval_prompt': 'auto'})
"""
http = self.get_auth_http_client()
body = urllib_parse.urlencode({
@@ -1234,7 +1231,6 @@ class FacebookGraphMixin(OAuth2Mixin):
Example usage::
class FacebookGraphLoginHandler(LoginHandler, tornado.auth.FacebookGraphMixin):
- @tornado.web.asynchronous
@tornado.gen.coroutine
def get(self):
if self.get_argument("code", False):
@@ -1321,7 +1317,6 @@ class FacebookGraphMixin(OAuth2Mixin):
class MainHandler(tornado.web.RequestHandler,
tornado.auth.FacebookGraphMixin):
@tornado.web.authenticated
- @tornado.web.asynchronous
@tornado.gen.coroutine
def get(self):
new_entry = yield self.facebook_request(
diff --git a/libs/tornado/escape.py b/libs/tornado/escape.py
index 302e556f..95c0f24e 100755
--- a/libs/tornado/escape.py
+++ b/libs/tornado/escape.py
@@ -55,7 +55,16 @@ _XHTML_ESCAPE_DICT = {'&': '&', '<': '<', '>': '>', '"': '"',
def xhtml_escape(value):
- """Escapes a string so it is valid within HTML or XML."""
+ """Escapes a string so it is valid within HTML or XML.
+
+ Escapes the characters ``<``, ``>``, ``"``, ``'``, and ``&``.
+ When used in attribute values the escaped strings must be enclosed
+ in quotes.
+
+ .. versionchanged:: 3.2
+
+ Added the single quote to the list of escaped characters.
+ """
return _XHTML_ESCAPE_RE.sub(lambda match: _XHTML_ESCAPE_DICT[match.group(0)],
to_basestring(value))
diff --git a/libs/tornado/gen.py b/libs/tornado/gen.py
index 21f692ab..aa931b45 100755
--- a/libs/tornado/gen.py
+++ b/libs/tornado/gen.py
@@ -59,7 +59,6 @@ For more complicated interfaces, `Task` can be split into two parts:
`Callback` and `Wait`::
class GenAsyncHandler2(RequestHandler):
- @asynchronous
@gen.coroutine
def get(self):
http_client = AsyncHTTPClient()
diff --git a/libs/tornado/ioloop.py b/libs/tornado/ioloop.py
index 0477ade0..e7b84dd7 100755
--- a/libs/tornado/ioloop.py
+++ b/libs/tornado/ioloop.py
@@ -301,6 +301,22 @@ class IOLoop(Configurable):
"""
raise NotImplementedError()
+ def _setup_logging(self):
+ """The IOLoop catches and logs exceptions, so it's
+ important that log output be visible. However, python's
+ default behavior for non-root loggers (prior to python
+ 3.2) is to print an unhelpful "no handlers could be
+ found" message rather than the actual log entry, so we
+ must explicitly configure logging if we've made it this
+ far without anything.
+
+ This method should be called from start() in subclasses.
+ """
+ if not any([logging.getLogger().handlers,
+ logging.getLogger('tornado').handlers,
+ logging.getLogger('tornado.application').handlers]):
+ logging.basicConfig()
+
def stop(self):
"""Stop the I/O loop.
@@ -550,15 +566,7 @@ class PollIOLoop(IOLoop):
action if action is not None else signal.SIG_DFL)
def start(self):
- if not logging.getLogger().handlers:
- # The IOLoop catches and logs exceptions, so it's
- # important that log output be visible. However, python's
- # default behavior for non-root loggers (prior to python
- # 3.2) is to print an unhelpful "no handlers could be
- # found" message rather than the actual log entry, so we
- # must explicitly configure logging if we've made it this
- # far without anything.
- logging.basicConfig()
+ self._setup_logging()
if self._stopped:
self._stopped = False
return
diff --git a/libs/tornado/log.py b/libs/tornado/log.py
index bc6898c8..36c3dd40 100755
--- a/libs/tornado/log.py
+++ b/libs/tornado/log.py
@@ -60,6 +60,13 @@ def _stderr_supports_color():
return color
+def _safe_unicode(s):
+ try:
+ return _unicode(s)
+ except UnicodeDecodeError:
+ return repr(s)
+
+
class LogFormatter(logging.Formatter):
"""Log formatter used in Tornado.
@@ -73,23 +80,37 @@ class LogFormatter(logging.Formatter):
`tornado.options.parse_command_line` (unless ``--logging=none`` is
used).
"""
- DEFAULT_PREFIX_FORMAT = '[%(levelname)1.1s %(asctime)s %(module)s:%(lineno)d]'
+ DEFAULT_FORMAT = '%(color)s[%(levelname)1.1s %(asctime)s %(module)s:%(lineno)d]%(end_color)s %(message)s'
DEFAULT_DATE_FORMAT = '%y%m%d %H:%M:%S'
+ DEFAULT_COLORS = {
+ logging.DEBUG: 4, # Blue
+ logging.INFO: 2, # Green
+ logging.WARNING: 3, # Yellow
+ logging.ERROR: 1, # Red
+ }
- def __init__(self, color=True, prefix_fmt=None, datefmt=None):
+ def __init__(self, color=True, fmt=DEFAULT_FORMAT,
+ datefmt=DEFAULT_DATE_FORMAT, colors=DEFAULT_COLORS):
r"""
- :arg bool color: Enables color support
- :arg string prefix_fmt: Log message prefix format.
- Prefix is a part of the log message, directly preceding the actual
- message text.
+ :arg bool color: Enables color support.
+ :arg string fmt: Log message format.
+ It will be applied to the attributes dict of log records. The
+ text between ``%(color)s`` and ``%(end_color)s`` will be colored
+ depending on the level if color support is on.
+ :arg dict colors: color mappings from logging level to terminal color
+ code
:arg string datefmt: Datetime format.
Used for formatting ``(asctime)`` placeholder in ``prefix_fmt``.
+
+ .. versionchanged:: 3.2
+
+ Added ``fmt`` and ``datefmt`` arguments.
"""
- self.__prefix_fmt = prefix_fmt if prefix_fmt is not None else self.DEFAULT_PREFIX_FORMAT
- datefmt = datefmt if datefmt is not None else self.DEFAULT_DATE_FORMAT
logging.Formatter.__init__(self, datefmt=datefmt)
- self._color = color and _stderr_supports_color()
- if self._color:
+ self._fmt = fmt
+
+ self._colors = {}
+ if color and _stderr_supports_color():
# The curses module has some str/bytes confusion in
# python3. Until version 3.2.3, most methods return
# bytes, but only accept strings. In addition, we want to
@@ -101,62 +122,56 @@ class LogFormatter(logging.Formatter):
curses.tigetstr("setf") or "")
if (3, 0) < sys.version_info < (3, 2, 3):
fg_color = unicode_type(fg_color, "ascii")
- self._colors = {
- logging.DEBUG: unicode_type(curses.tparm(fg_color, 4), # Blue
- "ascii"),
- logging.INFO: unicode_type(curses.tparm(fg_color, 2), # Green
- "ascii"),
- logging.WARNING: unicode_type(curses.tparm(fg_color, 3), # Yellow
- "ascii"),
- logging.ERROR: unicode_type(curses.tparm(fg_color, 1), # Red
- "ascii"),
- }
+
+ for levelno, code in colors.items():
+ self._colors[levelno] = unicode_type(curses.tparm(fg_color, code), "ascii")
self._normal = unicode_type(curses.tigetstr("sgr0"), "ascii")
+ else:
+ self._normal = ''
def format(self, record):
try:
- record.message = record.getMessage()
+ message = record.getMessage()
+ assert isinstance(message, basestring_type) # guaranteed by logging
+ # Encoding notes: The logging module prefers to work with character
+ # strings, but only enforces that log messages are instances of
+ # basestring. In python 2, non-ascii bytestrings will make
+ # their way through the logging framework until they blow up with
+ # an unhelpful decoding error (with this formatter it happens
+ # when we attach the prefix, but there are other opportunities for
+ # exceptions further along in the framework).
+ #
+ # If a byte string makes it this far, convert it to unicode to
+ # ensure it will make it out to the logs. Use repr() as a fallback
+ # to ensure that all byte strings can be converted successfully,
+ # but don't do it by default so we don't add extra quotes to ascii
+ # bytestrings. This is a bit of a hacky place to do this, but
+ # it's worth it since the encoding errors that would otherwise
+ # result are so useless (and tornado is fond of using utf8-encoded
+ # byte strings whereever possible).
+ record.message = _safe_unicode(message)
except Exception as e:
record.message = "Bad message (%r): %r" % (e, record.__dict__)
- assert isinstance(record.message, basestring_type) # guaranteed by logging
+
record.asctime = self.formatTime(record, self.datefmt)
- prefix = self.__prefix_fmt % record.__dict__
- if self._color:
- prefix = (self._colors.get(record.levelno, self._normal) +
- prefix + self._normal)
- # Encoding notes: The logging module prefers to work with character
- # strings, but only enforces that log messages are instances of
- # basestring. In python 2, non-ascii bytestrings will make
- # their way through the logging framework until they blow up with
- # an unhelpful decoding error (with this formatter it happens
- # when we attach the prefix, but there are other opportunities for
- # exceptions further along in the framework).
- #
- # If a byte string makes it this far, convert it to unicode to
- # ensure it will make it out to the logs. Use repr() as a fallback
- # to ensure that all byte strings can be converted successfully,
- # but don't do it by default so we don't add extra quotes to ascii
- # bytestrings. This is a bit of a hacky place to do this, but
- # it's worth it since the encoding errors that would otherwise
- # result are so useless (and tornado is fond of using utf8-encoded
- # byte strings whereever possible).
- def safe_unicode(s):
- try:
- return _unicode(s)
- except UnicodeDecodeError:
- return repr(s)
+ if record.levelno in self._colors:
+ record.color = self._colors[record.levelno]
+ record.end_color = self._normal
+ else:
+ record.color = record.end_color = ''
+
+ formatted = self._fmt % record.__dict__
- formatted = prefix + " " + safe_unicode(record.message)
if record.exc_info:
if not record.exc_text:
record.exc_text = self.formatException(record.exc_info)
if record.exc_text:
- # exc_text contains multiple lines. We need to safe_unicode
+ # exc_text contains multiple lines. We need to _safe_unicode
# each line separately so that non-utf8 bytes don't cause
# all the newlines to turn into '\n'.
lines = [formatted.rstrip()]
- lines.extend(safe_unicode(ln) for ln in record.exc_text.split('\n'))
+ lines.extend(_safe_unicode(ln) for ln in record.exc_text.split('\n'))
formatted = '\n'.join(lines)
return formatted.replace("\n", "\n ")
diff --git a/libs/tornado/platform/asyncio.py b/libs/tornado/platform/asyncio.py
index 09b2bf3d..162b3673 100644
--- a/libs/tornado/platform/asyncio.py
+++ b/libs/tornado/platform/asyncio.py
@@ -8,6 +8,8 @@ python3.4 -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOMain
(the tests log a few warnings with AsyncIOMainLoop because they leave some
unfinished callbacks on the event loop that fail when it resumes)
"""
+
+from __future__ import absolute_import, division, print_function, with_statement
import asyncio
import datetime
import functools
@@ -34,7 +36,10 @@ class BaseAsyncIOLoop(IOLoop):
for fd in list(self.handlers):
self.remove_handler(fd)
if all_fds:
- os.close(fd)
+ try:
+ os.close(fd)
+ except OSError:
+ pass
if self.close_loop:
self.asyncio_loop.close()
@@ -86,6 +91,7 @@ class BaseAsyncIOLoop(IOLoop):
self.handlers[fd](fd, events)
def start(self):
+ self._setup_logging()
self.asyncio_loop.run_forever()
def stop(self):
diff --git a/libs/tornado/platform/caresresolver.py b/libs/tornado/platform/caresresolver.py
index 7c16705d..c4648c22 100755
--- a/libs/tornado/platform/caresresolver.py
+++ b/libs/tornado/platform/caresresolver.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function, with_statement
import pycares
import socket
diff --git a/libs/tornado/platform/twisted.py b/libs/tornado/platform/twisted.py
index 86ef71b9..0c8a3105 100755
--- a/libs/tornado/platform/twisted.py
+++ b/libs/tornado/platform/twisted.py
@@ -456,6 +456,7 @@ class TwistedIOLoop(tornado.ioloop.IOLoop):
del self.fds[fd]
def start(self):
+ self._setup_logging()
self.reactor.run()
def stop(self):
diff --git a/libs/tornado/web.py b/libs/tornado/web.py
index 65a76cd4..b22b11fe 100755
--- a/libs/tornado/web.py
+++ b/libs/tornado/web.py
@@ -516,6 +516,10 @@ class RequestHandler(object):
See `clear_cookie` for more information on the path and domain
parameters.
+
+ .. versionchanged:: 3.2
+
+ Added the ``path`` and ``domain`` parameters.
"""
for name in self.request.cookies:
self.clear_cookie(name, path=path, domain=domain)
@@ -1850,6 +1854,11 @@ class StaticFileHandler(RequestHandler):
class method. Instance methods may use the attributes ``self.path``
``self.absolute_path``, and ``self.modified``.
+ Subclasses should only override methods discussed in this section;
+ overriding other methods is error-prone. Overriding
+ ``StaticFileHandler.get`` is particularly problematic due to the
+ tight coupling with ``compute_etag`` and other methods.
+
To change the way static urls are generated (e.g. to match the behavior
of another server or CDN), override `make_static_url`, `parse_url_path`,
`get_cache_time`, and/or `get_version`.