|
6 | 6 |
|
7 | 7 |
|
8 | 8 | class Transcoder(object): |
9 | | - def __init__(self, pipeline_id, region=None): |
| 9 | + def __init__(self, pipeline_id, region=None, access_key_id=None, secret_access_key=None): |
10 | 10 | self.pipeline_id = pipeline_id |
11 | 11 |
|
12 | 12 | if not region: |
13 | 13 | region = getattr(settings, 'AWS_REGION', None) |
14 | | - |
15 | 14 | self.aws_region = region |
16 | 15 |
|
17 | | - self.aws_access_key_id = getattr(settings, 'AWS_ACCESS_KEY_ID', '') |
18 | | - self.aws_secret_access_key = getattr(settings, 'AWS_SECRET_ACCESS_KEY', '') |
| 16 | + if not access_key_id: |
| 17 | + access_key_id = getattr(settings, 'AWS_ACCESS_KEY_ID', None) |
| 18 | + self.aws_access_key_id = access_key_id |
| 19 | + |
| 20 | + if not secret_access_key: |
| 21 | + secret_access_key = getattr(settings, 'AWS_SECRET_ACCESS_KEY', None) |
| 22 | + self.aws_secret_access_key = secret_access_key |
| 23 | + |
19 | 24 |
|
20 | | - if not self.aws_access_key_id: |
| 25 | + if self.aws_access_key_id is None: |
21 | 26 | assert False, 'Please provide AWS_ACCESS_KEY_ID' |
22 | 27 |
|
23 | | - if not self.aws_secret_access_key: |
| 28 | + if self.aws_secret_access_key is None: |
24 | 29 | assert False, 'Please provide AWS_SECRET_ACCESS_KEY' |
25 | 30 |
|
26 | | - if not self.aws_region: |
| 31 | + if self.aws_region is None: |
27 | 32 | assert False, 'Please provide AWS_REGION' |
28 | 33 |
|
29 | 34 |
|
|
0 commit comments