Skip to content

Commit

Permalink
#3930 workaround for older python versions
Browse files Browse the repository at this point in the history
we have to import from 'typing_extensions' and add the package dependency..
  • Loading branch information
totaam committed Jul 24, 2023
1 parent d0d505d commit d37fecb
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 4 deletions.
1 change: 1 addition & 0 deletions packaging/debian/xpra/control
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ Architecture: any
Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
,python3-gi
,gir1.2-glib-2.0
,python3-typing-extensions
Recommends:
,${x11:Depends}
# generate QR codes for authentication and connection URLs:
Expand Down
1 change: 1 addition & 0 deletions packaging/rpm/xpra.spec
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ BuildRequires: pandoc
BuildRequires: which
Requires: python3
Requires: python3-gobject
Requires: python3-typing-extensions
%if 0%{?el8}
BuildRequires: python3-dataclasses
Requires: python3-dataclasses
Expand Down
3 changes: 2 additions & 1 deletion xpra/client/gl/gl_drivers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
# later version. See the file COPYING for details.

from typing import Dict, Tuple, TypeAlias
from typing import Dict, Tuple
from typing_extensions import TypeAlias

#These chipsets will use OpenGL,
#there will not be any warnings, even if the vendor is greylisted:
Expand Down
3 changes: 2 additions & 1 deletion xpra/net/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import os
import threading
from typing import Tuple, Callable, List, Dict, TypeAlias, Any, ByteString, Union
from typing import Tuple, Callable, List, Dict, Any, ByteString, Union
from typing_extensions import TypeAlias

from xpra.net.compression import Compressed, Compressible, LargeStructure
from xpra.util import repr_ellipsized, envint, envbool
Expand Down
3 changes: 2 additions & 1 deletion xpra/notifications/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

import os.path
from io import BytesIO
from typing import Tuple, Optional, TypeAlias
from typing import Tuple, Optional
from typing_extensions import TypeAlias

from xpra.util import first_time
from xpra.os_util import load_binary_file
Expand Down
3 changes: 2 additions & 1 deletion xpra/server/source/client_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
# later version. See the file COPYING for details.

import sys
from typing import Dict, Any, Optional, Tuple, Callable, Union, TypeAlias, List
from typing import Dict, Any, Optional, Tuple, Callable, Union, List
from typing_extensions import TypeAlias
from time import sleep, monotonic
from threading import Event
from collections import deque
Expand Down

0 comments on commit d37fecb

Please sign in to comment.