Skip to content

Commit 9e0101d

Browse files
committed
Merge remote-tracking branch github/fix/119 into devel
2 parents 3661d15 + df4053c commit 9e0101d

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

git_repo/repo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ def setup_service(service):
534534
print('Enter the service\'s domain name:')
535535
new_conf['fqdn'] = input('[{}]> '.format(service.fqdn))
536536
print('Enter the service\'s port:')
537-
new_conf['port'] = input('[443]> ') or 443
537+
new_conf['port'] = input('[443]> ') or '443'
538538
print('Are you connecting using HTTPS? (you should):')
539539
if 'n' in input(' [Yn]> ').lower():
540540
new_conf['scheme'] = 'http'

git_repo/services/ext/gogs.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,13 @@ def __init__(self, *args, **kwargs):
7777

7878
super().__init__(*args, **kwargs)
7979

80+
def connect(self):
8081
self.gg.setup(self.url_ro)
8182
self.gg.set_token(self._privatekey)
8283
self.gg.set_default_private(self.default_create_private)
8384
self.gg.setup_session(
8485
self.session_certificate or not self.session_insecure,
8586
self.session_proxy)
86-
87-
def connect(self):
8887
try:
8988
self.username = self.user # Call to self.gg.authenticated_user()
9089
except HTTPError as err:

git_repo/services/service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def __init__(self, r=None, c=None, hc=[]):
205205

206206
@classmethod
207207
def build_url(cls):
208-
netloc = cls.fqdn if not getattr(cls, 'port', None) else ':'.join([cls.fqdn, cls.port])
208+
netloc = cls.fqdn if not getattr(cls, 'port', None) else '{}:{}'.format(cls.fqdn, cls.port)
209209
if not getattr(cls, 'scheme', None):
210210
cls.scheme = 'https'
211211
return ParseResult(cls.scheme, netloc, *['']*4).geturl()

0 commit comments

Comments
 (0)