Skip to content

Commit

Permalink
Merge pull request #1549 from pymedusa/develop
Browse files Browse the repository at this point in the history
Release 0.1.8
  • Loading branch information
medariox authored Nov 15, 2016
2 parents b6a8bc7 + 32ca6ae commit b3a16be
Show file tree
Hide file tree
Showing 521 changed files with 16,421 additions and 51,946 deletions.
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

Enable debug logging in Medusa settings, reproduce the error (be sure to disable after the bug is fixed)

Branch/Commit:
OS:
What you did:
What happened:
What you expected:
Logs:
**Branch/Commit:**
**OS:**
**What you did:**
**What happened:**
**What you expected:**
**Logs:**
```
PASTE LOGS HERE
```
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- [ ] PR is based on the DEVELOP branch
- [ ] Don't send big changes all at once. Split up big PRs into multiple smaller PRs that are easier to manage and review
- [ ] Read [contribution guide](https://github.com/PyMedusa/SickRage/blob/master/.github/CONTRIBUTING.md)
- [ ] Read the [contribution guide](https://github.com/pymedusa/Medusa/blob/master/.github/CONTRIBUTING.md)
12 changes: 2 additions & 10 deletions SickBeard.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
#!/usr/bin/env python2.7
# -*- coding: utf-8 -*
"""Script for backwards compatibility."""

from __future__ import unicode_literals

import sys

from start import Application

from medusa.__main__ import main

if __name__ == '__main__':
# start application
application = Application()
application.start(sys.argv[1:])
main()
4 changes: 2 additions & 2 deletions lib/adba/aniDBAbstracter.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def _get_aid_from_xml(self, name):
#regex = re.compile('[%s]' % re.escape(string.punctuation)) # remove any punctuation and e.g. ' (2011)'
name = regex.sub('', name.lower())
lastAid = 0
for element in self.allAnimeXML.getiterator():
for element in self.allAnimeXML.iter():
if element.get("aid", False):
lastAid = int(element.get("aid"))
if element.text:
Expand All @@ -204,7 +204,7 @@ def _get_name_from_xml(self, aid, onlyMain=True):

for anime in self.allAnimeXML.findall("anime"):
if int(anime.get("aid", False)) == aid:
for title in anime.getiterator():
for title in anime.iter():
currentLang = title.get("{http://www.w3.org/XML/1998/namespace}lang", False)
currentType = title.get("type", False)
if (currentLang == "en" and not onlyMain) or currentType == "main":
Expand Down
2 changes: 1 addition & 1 deletion lib/certifi/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from .core import where, old_where

__version__ = "2016.02.28"
__version__ = "2016.09.26"
381 changes: 270 additions & 111 deletions lib/certifi/cacert.pem

Large diffs are not rendered by default.

381 changes: 270 additions & 111 deletions lib/certifi/weak.pem

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions lib/hachoir_core/__init__.py

This file was deleted.

210 changes: 0 additions & 210 deletions lib/hachoir_core/benchmark.py

This file was deleted.

Loading

0 comments on commit b3a16be

Please sign in to comment.