Skip to content

Commit

Permalink
Adding support for cert-file from OS X.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhermes
dhermes committed Dec 1, 2015
1 parent d864c3e commit d16fa35
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion gcloud_bigtable/_helpers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@


import datetime
import platform

import pytz
import six

Expand Down Expand Up @@ -47,7 +49,12 @@
EPOCH = datetime.datetime.utcfromtimestamp(0).replace(tzinfo=pytz.utc)
# See https://gist.github.com/dhermes/bbc5b7be1932bfffae77
# for appropriate values on other systems.
SSL_CERT_FILE = '/etc/ssl/certs/ca-certificates.crt'
_PLAT_SYS = platform.system()
SSL_CERT_FILE = None
if _PLAT_SYS == 'Linux':
SSL_CERT_FILE = '/usr/local/etc/openssl/cert.pem'
elif _PLAT_SYS == 'Darwin': # pragma: NO COVER
SSL_CERT_FILE = '/etc/ssl/certs/ca-certificates.crt'


class MetadataTransformer(object):
Expand Down

1 comment on commit d16fa35

@dhermes
Copy link
Owner Author

@dhermes dhermes commented on d16fa35 Dec 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hilld1 RE:

I get an error with my imports:

"../cluster.py", line 28, in 
from gcloud_bigtable._helpers import _require_pb_property
ImportError: cannot import name _require_pb_property

_require_pb_property was removed without updating client.py

It seems you've got out-of-date versions of some of the files (or maybe of some .pyc files)

Please sign in to comment.