diff --git a/zerver/lib/bugdown/api_return_values_table_generator.py b/zerver/lib/bugdown/api_return_values_table_generator.py index e57f77c29b..87baa385b8 100644 --- a/zerver/lib/bugdown/api_return_values_table_generator.py +++ b/zerver/lib/bugdown/api_return_values_table_generator.py @@ -71,7 +71,7 @@ class APIReturnValuesTablePreprocessor(Preprocessor): ans += self.render_table(return_values[return_value]['additionalProperties'] ['properties'], spacing + 8) if ('items' in return_values[return_value] and - 'properties' in return_values[return_value]['items']): + 'properties' in return_values[return_value]['items']): ans += self.render_table(return_values[return_value]['items']['properties'], spacing + 4) return ans diff --git a/zerver/lib/upload.py b/zerver/lib/upload.py index 8dff4ca6d9..a22751b73e 100644 --- a/zerver/lib/upload.py +++ b/zerver/lib/upload.py @@ -629,7 +629,7 @@ class S3UploadBackend(ZulipUploadBackend): # We use the avatar bucket, because it's world-readable. bucket = get_bucket(session, settings.S3_AVATAR_BUCKET) key = bucket.Object(os.path.join("exports", generate_random_token(32), - os.path.basename(tarball_path))) + os.path.basename(tarball_path))) key.upload_file(tarball_path, Callback=percent_callback)