Merge pull request #1322 from JohnVillalovos/jlvillal/missing_vars

nejch · web-flow · commit a7ec67f69a31 · 2021-02-24T00:24:14.000+01:00
fix: undefined name errors in v4 objects
diff --git a/gitlab/v4/objects/ldap.py b/gitlab/v4/objects/ldap.py
@@ -50,4 +50,4 @@ def list(self, **kwargs):
         if isinstance(obj, list):
             return [self._obj_cls(self, item) for item in obj]
         else:
-            return base.RESTObjectList(self, self._obj_cls, obj)
+            return RESTObjectList(self, self._obj_cls, obj)
diff --git a/gitlab/v4/objects/projects.py b/gitlab/v4/objects/projects.py
@@ -31,7 +31,11 @@
 from .notification_settings import ProjectNotificationSettingsManager
 from .packages import ProjectPackageManager
 from .pages import ProjectPagesDomainManager
-from .pipelines import ProjectPipelineManager, ProjectPipelineScheduleManager
+from .pipelines import (
+    ProjectPipeline,
+    ProjectPipelineManager,
+    ProjectPipelineScheduleManager,
+)
 from .push_rules import ProjectPushRulesManager
 from .releases import ProjectReleaseManager
 from .runners import ProjectRunnerManager
@@ -556,10 +560,10 @@ def upload(self, filename, filedata=None, filepath=None, **kwargs):
                 * ``markdown`` - Markdown for the uploaded file
         """
         if filepath is None and filedata is None:
-            raise GitlabUploadError("No file contents or path specified")
+            raise exc.GitlabUploadError("No file contents or path specified")
 
         if filedata is not None and filepath is not None:
-            raise GitlabUploadError("File contents and file path specified")
+            raise exc.GitlabUploadError("File contents and file path specified")
 
         if filepath is not None:
             with open(filepath, "rb") as f:
