Skip to content

OK, now should be working w/ python3 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lhl wants to merge 5 commits into
base: master
Choose a base branch
from
Open

OK, now should be working w/ python3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
766f7e4
python3 compatible urlparse import
lhl Sep 18, 2015
0a6e455
empty init will allow imports, won't make python3 error out
lhl Sep 18, 2015
7951fa2
rolled back init change
lhl Sep 18, 2015
8c67251
fixed for python3
lhl Sep 18, 2015
2eb92ae
increment version
lhl Sep 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pyfav/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
from pyfav import get_favicon_url
from pyfav import parse_markup_for_favicon
from pyfav import download_favicon
try:
from pyfav import get_favicon_url
from pyfav import parse_markup_for_favicon
from pyfav import download_favicon
except:
from pyfav.pyfav import get_favicon_url
from pyfav.pyfav import parse_markup_for_favicon
from pyfav.pyfav import download_favicon
7 changes: 5 additions & 2 deletions pyfav/pyfav.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@


import urllib, os.path, string
from urlparse import urlparse
try:
from urlparse import urlparse
except:
from urllib.parse import urlparse
import requests
from bs4 import BeautifulSoup

Expand Down Expand Up @@ -189,4 +192,4 @@ def get_favicon_url(url):
return favicon_url

# No favicon in the markup or at url/favicon.ico
return None
return None
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

setup(
name = 'pyfav',
version = '0.1',
version = '0.2',
url = 'http://github.com/phillipsm/pyfav',
author = 'Matthew Phillips',
author_email = 'matt@mattphillips.info',
Expand All @@ -36,4 +36,4 @@
classifiers = filter(None, classifiers.split('\n')),
keywords = ['favicon', 'favicons'],
test_suite = 'test',
)
)