Skip to content
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.

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

Delete "six" python dependency as it generated an issue retrieving timetables #2

Merged
merged 1 commit into from
Jun 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added qml/certifi/__pycache__/__init__.cpython-35.pyc
Binary file not shown.
Binary file added qml/certifi/__pycache__/core.cpython-35.pyc
Binary file not shown.
Binary file added qml/chardet/__pycache__/__init__.cpython-35.pyc
Binary file not shown.
Binary file added qml/chardet/__pycache__/big5freq.cpython-35.pyc
Binary file not shown.
Binary file added qml/chardet/__pycache__/big5prober.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added qml/chardet/__pycache__/enums.cpython-35.pyc
Binary file not shown.
Binary file added qml/chardet/__pycache__/escprober.cpython-35.pyc
Binary file not shown.
Binary file added qml/chardet/__pycache__/escsm.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/chardet/__pycache__/euckrfreq.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/chardet/__pycache__/euctwfreq.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/chardet/__pycache__/gb2312freq.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added qml/chardet/__pycache__/jisfreq.cpython-35.pyc
Binary file not shown.
Binary file added qml/chardet/__pycache__/jpcntx.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added qml/chardet/__pycache__/mbcssm.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added qml/chardet/__pycache__/sjisprober.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/chardet/__pycache__/utf8prober.cpython-35.pyc
Binary file not shown.
Binary file added qml/chardet/__pycache__/version.cpython-35.pyc
Binary file not shown.
Binary file added qml/idna/__pycache__/__init__.cpython-35.pyc
Binary file not shown.
Binary file added qml/idna/__pycache__/core.cpython-35.pyc
Binary file not shown.
Binary file added qml/idna/__pycache__/idnadata.cpython-35.pyc
Binary file not shown.
Binary file added qml/idna/__pycache__/intranges.cpython-35.pyc
Binary file not shown.
Binary file added qml/idna/__pycache__/package_data.cpython-35.pyc
Binary file not shown.
Binary file added qml/pyemtmad/__pycache__/__init__.cpython-35.pyc
Binary file not shown.
Binary file added qml/pyemtmad/__pycache__/types.cpython-35.pyc
Binary file not shown.
Binary file added qml/pyemtmad/__pycache__/util.cpython-35.pyc
Binary file not shown.
Binary file added qml/pyemtmad/__pycache__/wrapper.cpython-35.pyc
Binary file not shown.
Binary file added qml/pyemtmad/api/__pycache__/__init__.cpython-35.pyc
Binary file not shown.
Binary file added qml/pyemtmad/api/__pycache__/bus.cpython-35.pyc
Binary file not shown.
Binary file added qml/pyemtmad/api/__pycache__/geo.cpython-35.pyc
Binary file not shown.
Binary file not shown.
8 changes: 5 additions & 3 deletions qml/pyemtmad/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"""

import ssl
import six
#import six
from requests.adapters import HTTPAdapter
from requests.packages.urllib3.poolmanager import PoolManager

Expand Down Expand Up @@ -131,9 +131,11 @@ def ints_to_string(ints):
str: Formatted string
"""
if not isinstance(ints, list):
return six.u(str(ints))
# return six.u(str(ints))
return str(ints)

return '|'.join(six.u(str(l)) for l in ints)
# return '|'.join(six.u(str(l)) for l in ints)
return '|'.join(str(l) for l in ints)

def language_code(code):
"""Generate the ``cultureInfo`` language code for the API.
Expand Down
Binary file added qml/requests/__pycache__/__init__.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/__version__.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/requests/__pycache__/adapters.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/api.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/auth.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/certs.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/compat.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/cookies.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/requests/__pycache__/hooks.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/models.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/packages.cpython-35.pyc
Binary file not shown.
Binary file added qml/requests/__pycache__/sessions.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added qml/requests/__pycache__/utils.cpython-35.pyc
Binary file not shown.
Binary file added qml/urllib3/__pycache__/__init__.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/urllib3/__pycache__/connection.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/urllib3/__pycache__/exceptions.cpython-35.pyc
Binary file not shown.
Binary file added qml/urllib3/__pycache__/fields.cpython-35.pyc
Binary file not shown.
Binary file added qml/urllib3/__pycache__/filepost.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/urllib3/__pycache__/request.cpython-35.pyc
Binary file not shown.
Binary file added qml/urllib3/__pycache__/response.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added qml/urllib3/util/__pycache__/queue.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added qml/urllib3/util/__pycache__/ssl_.cpython-35.pyc
Binary file not shown.
Binary file not shown.
Binary file added qml/urllib3/util/__pycache__/url.cpython-35.pyc
Binary file not shown.
Binary file added qml/urllib3/util/__pycache__/wait.cpython-35.pyc
Binary file not shown.
3 changes: 3 additions & 0 deletions rpm/harbour-bustopmadrid.changes
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

# * date Author's Name <author's email> version-release
# - Summary of changes
* Sat Jun 09 2018 pasko <[email protected]> 0.3-0
- Fixed bug when copying databases while running the app for the 1st time.
- Included missing python dependency (six).
* Fri Jun 08 2018 pasko <[email protected]> 0.2-0
- Added all python library dependencies to the rpm package.
- Added external link to Fares WebPage in English.
Expand Down
2 changes: 1 addition & 1 deletion rpm/harbour-bustopmadrid.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Name: harbour-bustopmadrid
%{!?qtc_make:%define qtc_make make}
%{?qtc_builddir:%define _builddir %qtc_builddir}
Summary: My Sailfish OS Application
Version: 0.2
Version: 0.3
Release: 0
Group: Qt/Qt
License: LICENSE
Expand Down