Merge pull request #2 from PaskoMoto/master2

Delete "six" python dependency as it generated an issue retrieving timetables
PaskoMoto · Jun 9, 2018 · 764fdc8 · 764fdc8
2 parents a4c41ea + a7c4352
commit 764fdc8
Show file tree

Hide file tree

Showing 98 changed files with 9 additions and 4 deletions.
diff --git a/qml/certifi/__pycache__/__init__.cpython-35.pyc b/qml/certifi/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/certifi/__pycache__/core.cpython-35.pyc b/qml/certifi/__pycache__/core.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/__init__.cpython-35.pyc b/qml/chardet/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/big5freq.cpython-35.pyc b/qml/chardet/__pycache__/big5freq.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/big5prober.cpython-35.pyc b/qml/chardet/__pycache__/big5prober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/chardistribution.cpython-35.pyc b/qml/chardet/__pycache__/chardistribution.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/charsetgroupprober.cpython-35.pyc b/qml/chardet/__pycache__/charsetgroupprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/charsetprober.cpython-35.pyc b/qml/chardet/__pycache__/charsetprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/codingstatemachine.cpython-35.pyc b/qml/chardet/__pycache__/codingstatemachine.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/cp949prober.cpython-35.pyc b/qml/chardet/__pycache__/cp949prober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/enums.cpython-35.pyc b/qml/chardet/__pycache__/enums.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/escprober.cpython-35.pyc b/qml/chardet/__pycache__/escprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/escsm.cpython-35.pyc b/qml/chardet/__pycache__/escsm.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/eucjpprober.cpython-35.pyc b/qml/chardet/__pycache__/eucjpprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/euckrfreq.cpython-35.pyc b/qml/chardet/__pycache__/euckrfreq.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/euckrprober.cpython-35.pyc b/qml/chardet/__pycache__/euckrprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/euctwfreq.cpython-35.pyc b/qml/chardet/__pycache__/euctwfreq.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/euctwprober.cpython-35.pyc b/qml/chardet/__pycache__/euctwprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/gb2312freq.cpython-35.pyc b/qml/chardet/__pycache__/gb2312freq.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/gb2312prober.cpython-35.pyc b/qml/chardet/__pycache__/gb2312prober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/hebrewprober.cpython-35.pyc b/qml/chardet/__pycache__/hebrewprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/jisfreq.cpython-35.pyc b/qml/chardet/__pycache__/jisfreq.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/jpcntx.cpython-35.pyc b/qml/chardet/__pycache__/jpcntx.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/langbulgarianmodel.cpython-35.pyc b/qml/chardet/__pycache__/langbulgarianmodel.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/langgreekmodel.cpython-35.pyc b/qml/chardet/__pycache__/langgreekmodel.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/langhebrewmodel.cpython-35.pyc b/qml/chardet/__pycache__/langhebrewmodel.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/langrussianmodel.cpython-35.pyc b/qml/chardet/__pycache__/langrussianmodel.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/langthaimodel.cpython-35.pyc b/qml/chardet/__pycache__/langthaimodel.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/langturkishmodel.cpython-35.pyc b/qml/chardet/__pycache__/langturkishmodel.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/latin1prober.cpython-35.pyc b/qml/chardet/__pycache__/latin1prober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/mbcharsetprober.cpython-35.pyc b/qml/chardet/__pycache__/mbcharsetprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/mbcsgroupprober.cpython-35.pyc b/qml/chardet/__pycache__/mbcsgroupprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/mbcssm.cpython-35.pyc b/qml/chardet/__pycache__/mbcssm.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/sbcharsetprober.cpython-35.pyc b/qml/chardet/__pycache__/sbcharsetprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/sbcsgroupprober.cpython-35.pyc b/qml/chardet/__pycache__/sbcsgroupprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/sjisprober.cpython-35.pyc b/qml/chardet/__pycache__/sjisprober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/universaldetector.cpython-35.pyc b/qml/chardet/__pycache__/universaldetector.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/utf8prober.cpython-35.pyc b/qml/chardet/__pycache__/utf8prober.cpython-35.pyc
diff --git a/qml/chardet/__pycache__/version.cpython-35.pyc b/qml/chardet/__pycache__/version.cpython-35.pyc
diff --git a/qml/idna/__pycache__/__init__.cpython-35.pyc b/qml/idna/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/idna/__pycache__/core.cpython-35.pyc b/qml/idna/__pycache__/core.cpython-35.pyc
diff --git a/qml/idna/__pycache__/idnadata.cpython-35.pyc b/qml/idna/__pycache__/idnadata.cpython-35.pyc
diff --git a/qml/idna/__pycache__/intranges.cpython-35.pyc b/qml/idna/__pycache__/intranges.cpython-35.pyc
diff --git a/qml/idna/__pycache__/package_data.cpython-35.pyc b/qml/idna/__pycache__/package_data.cpython-35.pyc
diff --git a/qml/pyemtmad/__pycache__/__init__.cpython-35.pyc b/qml/pyemtmad/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/pyemtmad/__pycache__/types.cpython-35.pyc b/qml/pyemtmad/__pycache__/types.cpython-35.pyc
diff --git a/qml/pyemtmad/__pycache__/util.cpython-35.pyc b/qml/pyemtmad/__pycache__/util.cpython-35.pyc
diff --git a/qml/pyemtmad/__pycache__/wrapper.cpython-35.pyc b/qml/pyemtmad/__pycache__/wrapper.cpython-35.pyc
diff --git a/qml/pyemtmad/api/__pycache__/__init__.cpython-35.pyc b/qml/pyemtmad/api/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/pyemtmad/api/__pycache__/bus.cpython-35.pyc b/qml/pyemtmad/api/__pycache__/bus.cpython-35.pyc
diff --git a/qml/pyemtmad/api/__pycache__/geo.cpython-35.pyc b/qml/pyemtmad/api/__pycache__/geo.cpython-35.pyc
diff --git a/qml/pyemtmad/api/__pycache__/parking.cpython-35.pyc b/qml/pyemtmad/api/__pycache__/parking.cpython-35.pyc
diff --git a/qml/pyemtmad/util.py b/qml/pyemtmad/util.py
@@ -21,7 +21,7 @@
 """
 
 import ssl
-import six
+#import six
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.poolmanager import PoolManager
 
@@ -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.

diff --git a/qml/requests/__pycache__/__init__.cpython-35.pyc b/qml/requests/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/requests/__pycache__/__version__.cpython-35.pyc b/qml/requests/__pycache__/__version__.cpython-35.pyc
diff --git a/qml/requests/__pycache__/_internal_utils.cpython-35.pyc b/qml/requests/__pycache__/_internal_utils.cpython-35.pyc
diff --git a/qml/requests/__pycache__/adapters.cpython-35.pyc b/qml/requests/__pycache__/adapters.cpython-35.pyc
diff --git a/qml/requests/__pycache__/api.cpython-35.pyc b/qml/requests/__pycache__/api.cpython-35.pyc
diff --git a/qml/requests/__pycache__/auth.cpython-35.pyc b/qml/requests/__pycache__/auth.cpython-35.pyc
diff --git a/qml/requests/__pycache__/certs.cpython-35.pyc b/qml/requests/__pycache__/certs.cpython-35.pyc
diff --git a/qml/requests/__pycache__/compat.cpython-35.pyc b/qml/requests/__pycache__/compat.cpython-35.pyc
diff --git a/qml/requests/__pycache__/cookies.cpython-35.pyc b/qml/requests/__pycache__/cookies.cpython-35.pyc
diff --git a/qml/requests/__pycache__/exceptions.cpython-35.pyc b/qml/requests/__pycache__/exceptions.cpython-35.pyc
diff --git a/qml/requests/__pycache__/hooks.cpython-35.pyc b/qml/requests/__pycache__/hooks.cpython-35.pyc
diff --git a/qml/requests/__pycache__/models.cpython-35.pyc b/qml/requests/__pycache__/models.cpython-35.pyc
diff --git a/qml/requests/__pycache__/packages.cpython-35.pyc b/qml/requests/__pycache__/packages.cpython-35.pyc
diff --git a/qml/requests/__pycache__/sessions.cpython-35.pyc b/qml/requests/__pycache__/sessions.cpython-35.pyc
diff --git a/qml/requests/__pycache__/status_codes.cpython-35.pyc b/qml/requests/__pycache__/status_codes.cpython-35.pyc
diff --git a/qml/requests/__pycache__/structures.cpython-35.pyc b/qml/requests/__pycache__/structures.cpython-35.pyc
diff --git a/qml/requests/__pycache__/utils.cpython-35.pyc b/qml/requests/__pycache__/utils.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/__init__.cpython-35.pyc b/qml/urllib3/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/_collections.cpython-35.pyc b/qml/urllib3/__pycache__/_collections.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/connection.cpython-35.pyc b/qml/urllib3/__pycache__/connection.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/connectionpool.cpython-35.pyc b/qml/urllib3/__pycache__/connectionpool.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/exceptions.cpython-35.pyc b/qml/urllib3/__pycache__/exceptions.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/fields.cpython-35.pyc b/qml/urllib3/__pycache__/fields.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/filepost.cpython-35.pyc b/qml/urllib3/__pycache__/filepost.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/poolmanager.cpython-35.pyc b/qml/urllib3/__pycache__/poolmanager.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/request.cpython-35.pyc b/qml/urllib3/__pycache__/request.cpython-35.pyc
diff --git a/qml/urllib3/__pycache__/response.cpython-35.pyc b/qml/urllib3/__pycache__/response.cpython-35.pyc
diff --git a/qml/urllib3/contrib/__pycache__/__init__.cpython-35.pyc b/qml/urllib3/contrib/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/urllib3/contrib/__pycache__/pyopenssl.cpython-35.pyc b/qml/urllib3/contrib/__pycache__/pyopenssl.cpython-35.pyc
diff --git a/qml/urllib3/contrib/__pycache__/socks.cpython-35.pyc b/qml/urllib3/contrib/__pycache__/socks.cpython-35.pyc
diff --git a/qml/urllib3/packages/__pycache__/__init__.cpython-35.pyc b/qml/urllib3/packages/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/urllib3/packages/__pycache__/six.cpython-35.pyc b/qml/urllib3/packages/__pycache__/six.cpython-35.pyc
diff --git a/qml/urllib3/packages/ssl_match_hostname/__pycache__/__init__.cpython-35.pyc b/qml/urllib3/packages/ssl_match_hostname/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/__init__.cpython-35.pyc b/qml/urllib3/util/__pycache__/__init__.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/connection.cpython-35.pyc b/qml/urllib3/util/__pycache__/connection.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/queue.cpython-35.pyc b/qml/urllib3/util/__pycache__/queue.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/request.cpython-35.pyc b/qml/urllib3/util/__pycache__/request.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/response.cpython-35.pyc b/qml/urllib3/util/__pycache__/response.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/retry.cpython-35.pyc b/qml/urllib3/util/__pycache__/retry.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/ssl_.cpython-35.pyc b/qml/urllib3/util/__pycache__/ssl_.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/timeout.cpython-35.pyc b/qml/urllib3/util/__pycache__/timeout.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/url.cpython-35.pyc b/qml/urllib3/util/__pycache__/url.cpython-35.pyc
diff --git a/qml/urllib3/util/__pycache__/wait.cpython-35.pyc b/qml/urllib3/util/__pycache__/wait.cpython-35.pyc
diff --git a/rpm/harbour-bustopmadrid.changes b/rpm/harbour-bustopmadrid.changes
@@ -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.

diff --git a/rpm/harbour-bustopmadrid.spec b/rpm/harbour-bustopmadrid.spec
@@ -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