Merge branch 'fixes' of zorun/himport into master

himport/cli.py

@@ -95,7 +95,7 @@ def do_sqlalchemy(options):
 
 
 def main():
-    locale.setlocale(locale.LC_ALL, b'fr_FR.utf-8')
+    locale.setlocale(locale.LC_ALL, 'fr_FR.utf-8')
     options = process_args()
 
     do_sqlalchemy(options)
@@ -105,5 +105,5 @@ if __name__ == "__main__":
     try:
         main(sys.argv[1:])
     except Exception as e:
-        print e.message
+        print(e.message)
         sys.exit(1)

himport/dolibarrAlchemyHledger.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-import settings
 import datetime
 
+from himport import settings
 from himport.dolibarrAlchemy import DolibarrSQLAlchemy
 
 

himport/dolibarrWriter.py

@@ -1,7 +1,8 @@
-import settings
 import os
 import codecs
 
+from himport import settings
+
 
 class Writer(object):
     output_files = settings.get('OUTPUT_FILES')

requirements.pip

@@ -1,2 +1,2 @@
-MySQL-python
+mysqlclient
 sqlalchemy

setup.py

@@ -76,7 +76,7 @@ setup(
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['MySQL-python', 'sqlalchemy', 'future'],
+    install_requires=['mysqlclient', 'sqlalchemy', 'future'],
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,