Mercurial Repositories > eric / file comparison
comparison: eric6/DebugClients/Python/DebugClientBase.py
eric6/DebugClients/Python/DebugClientBase.py
- changeset 8230
- 8b5c6896655b
- parent 8228
- 772103b14c18
- child 8240
- 93b8a353c4bf
equal
deleted
inserted
replaced
| 8229:6fa22aa4fc4a | 8230:8b5c6896655b |
|---|---|
| 1957 frmnr = self.framenr | 1957 frmnr = self.framenr |
| 1958 while cf is not None and frmnr > 0: | 1958 while cf is not None and frmnr > 0: |
| 1959 cf = cf.f_back | 1959 cf = cf.f_back |
| 1960 frmnr -= 1 | 1960 frmnr -= 1 |
| 1961 | 1961 |
| 1962 if cf is None: | 1962 globaldict = self.debugMod.__dict__ if cf is None else cf.f_globals |
| 1963 globaldict = self.debugMod.__dict__ | |
| 1964 else: | |
| 1965 globaldict = cf.f_globals | |
| 1966 | 1963 |
| 1967 globalCompleter = Completer(globaldict).complete | 1964 globalCompleter = Completer(globaldict).complete |
| 1968 self.__getCompletionList(text, globalCompleter, completions) | 1965 self.__getCompletionList(text, globalCompleter, completions) |
| 1969 | 1966 |
| 1970 self.sendJsonCommand("ResponseCompletion", { | 1967 self.sendJsonCommand("ResponseCompletion", { |
| 2024 host = os.getenv('ERICHOST', 'localhost') | 2021 host = os.getenv('ERICHOST', 'localhost') |
| 2025 if port is None: | 2022 if port is None: |
| 2026 port = os.getenv('ERICPORT', 42424) | 2023 port = os.getenv('ERICPORT', 42424) |
| 2027 | 2024 |
| 2028 remoteAddress = self.__resolveHost(host) | 2025 remoteAddress = self.__resolveHost(host) |
| 2029 if filename is not None: | 2026 name = os.path.basename(filename) if filename is not None else "" |
| 2030 name = os.path.basename(filename) | |
| 2031 else: | |
| 2032 name = "" | |
| 2033 self.connectDebugger(port, remoteAddress, redirect, name=name) | 2027 self.connectDebugger(port, remoteAddress, redirect, name=name) |
| 2034 if filename is not None: | 2028 if filename is not None: |
| 2035 self.running = os.path.abspath(filename) | 2029 self.running = os.path.abspath(filename) |
| 2036 else: | 2030 else: |
| 2037 try: | 2031 try: |
| 2185 """ | 2179 """ |
| 2186 try: | 2180 try: |
| 2187 host, version = host.split("@@") | 2181 host, version = host.split("@@") |
| 2188 except ValueError: | 2182 except ValueError: |
| 2189 version = 'v4' | 2183 version = 'v4' |
| 2190 if version == 'v4': | 2184 family = socket.AF_INET if version == 'v4' else socket.AF_INET6 |
| 2191 family = socket.AF_INET | |
| 2192 else: | |
| 2193 family = socket.AF_INET6 | |
| 2194 | 2185 |
| 2195 retryCount = 0 | 2186 retryCount = 0 |
| 2196 while retryCount < 10: | 2187 while retryCount < 10: |
| 2197 try: | 2188 try: |
| 2198 addrinfo = socket.getaddrinfo( | 2189 addrinfo = socket.getaddrinfo( |
