Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ def messageBox(self, message, title="Information"):
pass

def openDesktop(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> JFrame
# type: (*Any, **Union[str, unicode]) -> JFrame
pass

def openDiagnostics(self):
Expand Down Expand Up @@ -497,7 +497,7 @@ def showTouchscreenKeyboard(
pass

def transform(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> PyObject
# type: (*Any, **Union[str, unicode]) -> PyObject
pass

def warningBox(self, message, title="Warning"):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def setdefault(self, pyKey, def_=None):
raise NotImplementedError

def update(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> None
# type: (*Any, **Union[str, unicode]) -> None
raise NotImplementedError

def __setitem__(self, pyKey, pyValue):
Expand Down Expand Up @@ -162,7 +162,7 @@ def remove(self, element):
raise NotImplementedError

def sort(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> None
# type: (*Any, **Union[str, unicode]) -> None
raise NotImplementedError

def __iter__(self):
Expand Down Expand Up @@ -291,7 +291,7 @@ def setdefault(self, pyKey, def_=None):
pass

def update(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> None
# type: (*Any, **Union[str, unicode]) -> None
raise NotImplementedError

def __setitem__(self, pyKey, pyValue):
Expand Down Expand Up @@ -326,7 +326,7 @@ def remove(self, element):
raise NotImplementedError

def sort(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> None
# type: (*Any, **Union[str, unicode]) -> None
pass

def __add__(self, other):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def setdefault(self, key, default):
pass

def update(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> None
# type: (*Any, **Union[str, unicode]) -> None
pass

def values(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def browseServer(
]

def getServers(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> List[Union[str, unicode]] # noqa: W505
# type: (*Any, **Union[str, unicode]) -> List[Union[str, unicode]] # noqa: W505
pass

def getServerState(self, opcServer):
Expand Down Expand Up @@ -108,11 +108,11 @@ def setServerEnabled(self, serverName, enabled):
pass

def writeValue(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> QualityCode
# type: (*Any, **Union[str, unicode]) -> QualityCode
pass

def writeValues(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> List[QualityCode]
# type: (*Any, **Union[str, unicode]) -> List[QualityCode]
pass


Expand Down Expand Up @@ -424,7 +424,7 @@ def sort(

@staticmethod
def toCSV(*args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> Union[str, unicode] # noqa: W505
# type: (*Any, **Union[str, unicode]) -> Union[str, unicode] # noqa: W505
pass

@staticmethod
Expand All @@ -444,7 +444,7 @@ def toDataSet(*args):

@staticmethod
def toExcel(*args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> bytearray
# type: (*Any, **Union[str, unicode]) -> bytearray
pass

@staticmethod
Expand Down Expand Up @@ -636,5 +636,5 @@ def logger(loggerName):

@staticmethod
def parseTranslateArguments(*args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> Tuple[Union[str, unicode], Union[str, unicode], bool] # noqa: E501, W505 # pylint: disable=line-too-long
# type: (*Any, **Union[str, unicode]) -> Tuple[Union[str, unicode], Union[str, unicode], bool] # noqa: E501, W505 # pylint: disable=line-too-long
pass
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ class JythonHttpClient(Object):
"""

def delete(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> Response
# type: (*Any, **Union[str, unicode]) -> Response
pass

def deleteAsync(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> Promise
# type: (*Any, **Union[str, unicode]) -> Promise
pass

def get(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> Response
# type: (*Any, **Union[str, unicode]) -> Response
pass

def getAsync(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> Promise
# type: (*Any, **Union[str, unicode]) -> Promise
pass

def getConnectTimeout(self):
Expand Down Expand Up @@ -276,7 +276,7 @@ def cancel(self):
return True

def get(self, *args, **kwargs):
# type: (*PyObject, **Union[str, unicode]) -> Any
# type: (*Any, **Union[str, unicode]) -> Any
pass

def getFuture(self):
Expand Down
2 changes: 1 addition & 1 deletion src/org/python/core/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,7 @@ def size(self):
pass

def sort(self, *args):
# type: (*PyObject) -> None
# type: (*Any) -> None
pass

def subList(self, fromIndex, toIndex):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class WindowUtilities(Object):
def messageBox(
self, message: Union[str, unicode], title: Union[str, unicode] = ...
) -> None: ...
def openDesktop(self, *args: PyObject, **kwargs: Union[str, unicode]) -> JFrame: ...
def openDesktop(self, *args: Any, **kwargs: Union[str, unicode]) -> JFrame: ...
def openDiagnostics(self) -> None: ...
def passwordBox(
self,
Expand All @@ -197,7 +197,7 @@ class WindowUtilities(Object):
fontSize: Optional[int] = ...,
password: Optional[bool] = ...,
) -> Union[str, unicode]: ...
def transform(self, *args: PyObject, **kwargs: Union[str, unicode]) -> PyObject: ...
def transform(self, *args: Any, **kwargs: Union[str, unicode]) -> PyObject: ...
def warningBox(
self, message: Union[str, unicode], title: Union[str, unicode] = ...
) -> None: ...
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class MutableJythonMap:
def setdefault(
self, pyKey: PyObject, def_: Optional[PyObject] = ...
) -> PyObject: ...
def update(self, *args: PyObject, **kwargs: Union[str, unicode]) -> None: ...
def update(self, *args: Any, **kwargs: Union[str, unicode]) -> None: ...
def __setitem__(self, pyKey: PyObject, pyValue: PyObject) -> None: ...
def __delitem__(self, pyKey: PyObject) -> None: ...

Expand All @@ -45,7 +45,7 @@ class MutableJythonSequence(JythonSequence):
def insert(self, index: int, element: PyObject) -> None: ...
def pop(self, index: Optional[int] = ...) -> PyObject: ...
def remove(self, element: PyObject) -> None: ...
def sort(self, *args: PyObject, **kwargs: Union[str, unicode]) -> None: ...
def sort(self, *args: Any, **kwargs: Union[str, unicode]) -> None: ...
def __iter__(self) -> Iterator[Any]: ...
def __contains__(self, o: PyObject) -> bool: ...
def __len__(self) -> int: ...
Expand Down Expand Up @@ -83,7 +83,7 @@ class AbstractMutableJythonMap(MutableJythonMap):
def setdefault(
self, pyKey: PyObject, def_: Optional[PyObject] = ...
) -> PyObject: ...
def update(self, *args: PyObject, **kwargs: Union[str, unicode]) -> None: ...
def update(self, *args: Any, **kwargs: Union[str, unicode]) -> None: ...
def __setitem__(self, pyKey: PyObject, pyValue: PyObject) -> None: ...
def __delitem__(self, pyKey: PyObject) -> None: ...

Expand All @@ -93,5 +93,5 @@ class AbstractMutableJythonSequence(AbstractJythonSequence, MutableJythonSequenc
def insert(self, index: int, element: PyObject) -> None: ...
def pop(self, index: Optional[int] = ...) -> PyObject: ...
def remove(self, element: PyObject) -> None: ...
def sort(self, *args: PyObject, **kwargs: Union[str, unicode]) -> None: ...
def sort(self, *args: Any, **kwargs: Union[str, unicode]) -> None: ...
def __add__(self, other: PyObject) -> PyObject: ...
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class PyJsonObjectAdapter(Object):
def pop(self, key: PyObject) -> PyObject: ...
def popitem(self) -> PyObject: ...
def setdefault(self, key: PyObject, default: PyObject) -> PyObject: ...
def update(self, *args: PyObject, **kwargs: Union[str, unicode]) -> None: ...
def update(self, *args: Any, **kwargs: Union[str, unicode]) -> None: ...
def values(self) -> List[PyObject]: ...
def __setitem__(self, key: PyObject, value: PyObject) -> None: ...
def __delitem__(self, key: PyObject) -> None: ...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class AbstractOPCUtilities(Object):
self, opcServer: Union[str, unicode], nodeId: Union[str, unicode]
) -> List[AbstractOPCUtilities.PyOPCTag]: ...
def getServers(
self, *args: PyObject, **kwargs: Union[str, unicode]
self, *args: Any, **kwargs: Union[str, unicode]
) -> List[Union[str, unicode]]: ...
def getServerState(self, opcServer: Union[str, unicode]) -> Union[str, unicode]: ...
def isServerEnabled(self, serverName: Union[str, unicode]) -> bool: ...
Expand All @@ -53,11 +53,9 @@ class AbstractOPCUtilities(Object):
def setServerEnabled(
self, serverName: Union[str, unicode], enabled: bool
) -> None: ...
def writeValue(
self, *args: PyObject, **kwargs: Union[str, unicode]
) -> QualityCode: ...
def writeValue(self, *args: Any, **kwargs: Union[str, unicode]) -> QualityCode: ...
def writeValues(
self, *args: PyObject, **kwargs: Union[str, unicode]
self, *args: Any, **kwargs: Union[str, unicode]
) -> List[QualityCode]: ...

class DatasetUtilities(Object):
Expand Down Expand Up @@ -145,9 +143,7 @@ class DatasetUtilities(Object):
naturalOrdering: Optional[bool] = ...,
) -> BasicDataset: ...
@staticmethod
def toCSV(
*args: PyObject, **kwargs: Union[str, unicode]
) -> Union[str, unicode]: ...
def toCSV(*args: Any, **kwargs: Union[str, unicode]) -> Union[str, unicode]: ...
@staticmethod
def toCSVJava(
ds: Dataset, showHeaders: bool, forExport: bool, localized: bool = ...
Expand All @@ -159,7 +155,7 @@ class DatasetUtilities(Object):
@staticmethod
def toDataSet(*args: Any) -> Dataset: ...
@staticmethod
def toExcel(*args: PyObject, **kwargs: Union[str, unicode]) -> bytearray: ...
def toExcel(*args: Any, **kwargs: Union[str, unicode]) -> bytearray: ...
@staticmethod
def toJSONObject(data: Dataset) -> JSONObject: ...
@staticmethod
Expand Down Expand Up @@ -234,5 +230,5 @@ class SystemUtilities(Object):
def logger(loggerName: Union[str, unicode]) -> Logger: ...
@staticmethod
def parseTranslateArguments(
*args: PyObject, **kwargs: Union[str, unicode]
*args: Any, **kwargs: Union[str, unicode]
) -> Tuple[Union[str, unicode], Union[str, unicode], bool]: ...
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ class CookieManager(JCookieManager):
def __init__(self, *args: Any) -> None: ...

class JythonHttpClient(Object):
def delete(self, *args: PyObject, **kwargs: Union[str, unicode]) -> Response: ...
def deleteAsync(
self, *args: PyObject, **kwargs: Union[str, unicode]
) -> Promise: ...
def get(self, *args: PyObject, **kwargs: Union[str, unicode]) -> Response: ...
def getAsync(self, *args: PyObject, **kwargs: Union[str, unicode]) -> Promise: ...
def delete(self, *args: Any, **kwargs: Union[str, unicode]) -> Response: ...
def deleteAsync(self, *args: Any, **kwargs: Union[str, unicode]) -> Promise: ...
def get(self, *args: Any, **kwargs: Union[str, unicode]) -> Response: ...
def getAsync(self, *args: Any, **kwargs: Union[str, unicode]) -> Promise: ...
def getConnectTimeout(self) -> long: ...
def getCookieManager(self) -> CookieManager: ...
def getJavaClient(self) -> HttpClient: ...
Expand Down Expand Up @@ -182,7 +180,7 @@ class JythonHttpClient(Object):

class Promise(Object):
def cancel(self) -> bool: ...
def get(self, *args: PyObject, **kwargs: Union[str, unicode]) -> Any: ...
def get(self, *args: Any, **kwargs: Union[str, unicode]) -> Any: ...
def getFuture(self) -> CompletableFuture: ...
def handleException(self, callback: PyObject) -> Promise: ...
def isDone(self) -> bool: ...
Expand Down
2 changes: 1 addition & 1 deletion stubs/stubs/org/python/core/__init__.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ class PyList(PySequenceList):
def reverse(self) -> None: ...
def set(self, index: int, element: Object) -> Object: ...
def size(self) -> int: ...
def sort(self, *args: PyObject) -> None: ...
def sort(self, *args: Any) -> None: ...
def subList(self, fromIndex: int, toIndex: int) -> List[PyObject]: ...
def toArray(self, a: Optional[List[Object]] = ...) -> List[Object]: ...

Expand Down