Skip to content

Commit 05dd3e4

Browse files
author
Thibaud Baas
authored
Merge pull request #177 from dataiku/fix/fm-client-for-python27
Fix/fm client for python27
2 parents e98a709 + 750b086 commit 05dd3e4

File tree

4 files changed

+28
-4
lines changed

4 files changed

+28
-4
lines changed

dataikuapi/fm/instances.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
from enum import Enum
21
from .future import FMFuture
32

3+
import sys
4+
5+
if sys.version_info > (3, 4):
6+
from enum import Enum
7+
else:
8+
9+
class Enum(object):
10+
pass
11+
412

513
class FMInstanceCreator(object):
614
def __init__(

dataikuapi/fm/instancesettingstemplates.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
from enum import Enum
21
import json
32
from dataikuapi.fm.future import FMFuture
43

4+
import sys
5+
6+
if sys.version_info > (3, 4):
7+
from enum import Enum
8+
else:
9+
10+
class Enum(object):
11+
pass
12+
513

614
class FMInstanceSettingsTemplateCreator(object):
715
def __init__(self, client, label):

dataikuapi/fmclient.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from requests.auth import HTTPBasicAuth
55
import os.path as osp
66

7-
from enum import Enum
87
from .utils import DataikuException
98

109
from .fm.tenant import FMCloudCredentials, FMCloudTags
@@ -29,6 +28,15 @@
2928
FMAzureInstanceSettingsTemplateCreator,
3029
)
3130

31+
import sys
32+
33+
if sys.version_info > (3, 4):
34+
from enum import Enum
35+
else:
36+
37+
class Enum(object):
38+
pass
39+
3240

3341
class FMClient(object):
3442
def __init__(

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
name='dataiku-api-client',
1212
version=VERSION,
1313
license="Apache Software License",
14-
packages=["dataikuapi", "dataikuapi.dss", "dataikuapi.apinode_admin"],
14+
packages=["dataikuapi", "dataikuapi.dss", "dataikuapi.apinode_admin", "dataikuapi.fm"],
1515
description="Python API client for Dataiku APIs",
1616
long_description=long_description,
1717
author="Dataiku",

0 commit comments

Comments
 (0)