Merge 4d927b3 into 1c96b88

.travis.yml

@@ -42,6 +42,7 @@ jobs:
       - virtualenv venv -p python3
       - source venv/bin/activate
       script:
+      - locale
       - py.test -n 0
     - stage: deploy
       if: tag IS present

src/pytest_postgresql/executor.py

@@ -18,6 +18,7 @@
 """PostgreSQL executor crafter around pg_ctl."""
 
 import os.path
+import platform
 import re
 import shutil
 import subprocess
@@ -29,6 +30,11 @@
 from mirakuru.base import ExecutorType
 from mirakuru.exceptions import ProcessFinishedWithError
 
+_LOCALE = "C.UTF-8"
+
+if platform.system() == "Darwin":
+    _LOCALE = "en_US.UTF-8"
+
 
 class PostgreSQLUnsupported(Exception):
     """Exception raised when postgresql<9.0 would be detected."""
@@ -100,9 +106,9 @@ def __init__(self, executable, host, port,
             timeout=timeout,
             sleep=sleep,
             envvars={
-                'LC_ALL': 'C.UTF-8',
-                'LC_CTYPE': 'C.UTF-8',
-                'LANG': 'C.UTF-8',
+                "LC_ALL": _LOCALE,
+                "LC_CTYPE": _LOCALE,
+                "LANG": _LOCALE,
             }
         )