Merge pull request #10 from TomaszKolek/fixed-prints

Adjust to python3

Author: bsab

demo/tests/test_api_client.py

@@ -8,19 +8,19 @@ def get_unifi_client():
 class TestAPI(TestCase):
 
  def test_can_instantiate_instance_of_unificlient(self):
- print "test_can_instantiate_instance_of_unificlient"
- ufc = get_unifi_client();
+ print("test_can_instantiate_instance_of_unificlient")
+ ufc = get_unifi_client()
  assert isinstance(ufc, UnifiClient)
 
  def test_login_as_admin(self):
- print "test_login_as_admin"
- ufc = get_unifi_client();
+ print("test_login_as_admin")
+ ufc = get_unifi_client()
  status_code = ufc.login_on_unifi_server()
  assert status_code == 200
 
  def test_authorize_guest(self):
- print "test_authorize_guest"
- ufc = get_unifi_client();
+ print("test_authorize_guest")
+ ufc = get_unifi_client()
  ufc.login_on_unifi_server()
  status_code = ufc.authorize_guest(guest_mac='04:4b:ed:25:c6:b3',
  minutes='10',
@@ -29,23 +29,23 @@ def test_authorize_guest(self):
  assert status_code == 200
 
  def test_unauthorize_guest(self):
- print "test_unauthorize_guest"
- ufc = get_unifi_client();
+ print("test_unauthorize_guest")
+ ufc = get_unifi_client()
  ufc.login_on_unifi_server()
  status_code = ufc.unauthorize_guest(guest_mac='04:4b:ed:25:c6:b3')
 
  assert status_code == 200
 
  def test_logout_admin(self):
- print "test_logout_admin"
- ufc = get_unifi_client();
+ print("test_logout_admin")
+ ufc = get_unifi_client()
  ufc.login_on_unifi_server()
  status_code = ufc.logout_from_unifi_server()
  assert status_code == 200
 
  def test_send_authorization(self):
- print "test_send_authorization"
- ufc = get_unifi_client();
+ print("test_send_authorization")
+ ufc = get_unifi_client()
  ufc.login_on_unifi_server()
  status_code = ufc.send_authorization(guest_mac='04:4b:ed:25:c6:b3',
  minutes='10',

demo/tests/test_login.py

@@ -17,40 +17,40 @@ def setUp(self):
  try:
  self.user = User.objects.get(username='lennon@thebeatles.com')
  except User.DoesNotExist:
- self.user = User();
- self.user.set_password('johnpassword');
- self.user.username = 'lennon@thebeatles.com';
- self.user.email = 'lennon@thebeatles.com';
- self.user.is_active = True;
- self.user.save();
-
- fbuserprofile = UnifiUser();
- fbuserprofile.user = self.user;
- fbuserprofile.save();
+ self.user = User()
+ self.user.set_password('johnpassword')
+ self.user.username = 'lennon@thebeatles.com'
+ self.user.email = 'lennon@thebeatles.com'
+ self.user.is_active = True
+ self.user.save()
+
+ fbuserprofile = UnifiUser()
+ fbuserprofile.user = self.user
+ fbuserprofile.save()
  except Exception as exp:
- print "EXCEPTION:LoginTestCase-->", str(exp)
- pass;
+ print("EXCEPTION:LoginTestCase-->", str(exp))
+ pass
 
 
  def testIndexView(self):
- print ">> testIndexView"
+ print(">> testIndexView")
  self.setUp()
  self.client.login(username='lennon@thebeatles.com', password='johnpassword')
 
  test_url_ihone = '/guest/s/default/?id=04:4b:ed:25:c6:b3&ap=f0:9f:c2:39:86:f2&t=1496998102&url=http://captive.apple.com%2fhotspot-detect.html&ssid=ClubLaVela'
  test_url_samsung='/guest/s/default/?id=88:ad:d2:e4:cf:f4&ap=f0:9f:c2:39:86:f2&t=1496848672&url=http://connectivitycheck.gstatic.com%2fgenerate_204&ssid=ClubLaVela'
  response = self.client.get(test_url_samsung)
 
- self.assertEqual(response.status_code, 200);
+ self.assertEqual(response.status_code, 200)
 
 
  def testIndexViewWrongUrl(self):
- print ">> testIndexView"
+ print(">> testIndexView")
  self.setUp()
  self.client.login(username='lennon@thebeatles.com', password='johnpassword')
 
  test_url_ihone = '/guest/s/default/?id=04:4b:ed:25:c6:b3&ap=f0:9f:c2:39:86:f2&t=1496998102&url=http://captive.apple.com%2fhotspot-detect.html&ssid=ClubLaVela'
  test_url_samsung='/guest/?id=88:ad:d2:e4:cf:f4&ap=f0:9f:c2:39:86:f2&t=1496848672&url=http://connectivitycheck.gstatic.com%2fgenerate_204&ssid=ClubLaVela'
  response = self.client.get(test_url_samsung)
 
- self.assertEqual(response.status_code, 404);
+ self.assertEqual(response.status_code, 404)

demo/unifi/views.py

@@ -8,7 +8,7 @@ class ListGuestView(AjaxResponseMixin, ListView):
  template_name = "user_list.html"
 
  def get_queryset(self):
- return UnifiUser.objects.all();
+ return UnifiUser.objects.all()
 
  #@method_decorator(login_required)
  def dispatch(self, request, *args, **kwargs):

django_unifi_portal/models.py

@@ -9,15 +9,15 @@ class UnifiUser(models.Model):
 
  user = models.ForeignKey(User)
  picture = models.ImageField(upload_to='profile_images', default='profile_images/user_no_image.png',null=True)
- language = models.CharField(max_length=8, default='it-IT');# aggiunto il 22/11/2016
- gender = models.CharField(max_length=10, null=True);
- city = models.CharField(max_length=200, null = True);
- about = models.CharField(max_length=255, null=True);
- dob = models.DateField(null=True);
-
- phone = models.CharField(max_length=255, null=True);
- guest_mac = models.CharField(max_length=255, null=True);
- last_backend_login = models.CharField(max_length=30, null=True);
+ language = models.CharField(max_length=8, default='it-IT') # aggiunto il 22/11/2016
+ gender = models.CharField(max_length=10, null=True)
+ city = models.CharField(max_length=200, null = True)
+ about = models.CharField(max_length=255, null=True)
+ dob = models.DateField(null=True)
+
+ phone = models.CharField(max_length=255, null=True)
+ guest_mac = models.CharField(max_length=255, null=True)
+ last_backend_login = models.CharField(max_length=30, null=True)
 
  def __unicode__(self):
  return self.user.username

django_unifi_portal/pipeline.py

@@ -28,7 +28,7 @@ def user_details(strategy, details, user=None, *args, **kwargs):
  """Update user details using data from provider."""
  if user:
  if not UnifiUser.objects.filter(user=user).exists():
- print "user_details:UserProfile NOT exist, creating.."
+ print("user_details:UserProfile NOT exist, creating..")
  changed = False # flag to track changes
  protected = ('username', 'id', 'pk', 'email') + \
  tuple(strategy.setting('PROTECTED_USER_FIELDS', []))
@@ -43,9 +43,9 @@ def user_details(strategy, details, user=None, *args, **kwargs):
  current_value = getattr(user, name, None)
  if not current_value or name not in protected:
  changed |= current_value != value
- # print "user_details::name", name
- value = value.replace("'", " ")[0:29];
- # print "user_details::value", value; #FIX - crash con nomi superiori ai 30 caratteri
+ # print("user_details::name", name)
+ value = value.replace("'", " ")[0:29]
+ # print("user_details::value", value) #FIX - crash con nomi superiori ai 30 caratteri
 
  setattr(user, name, value)
 
@@ -60,28 +60,28 @@ def save_profile(backend, user, response, *args, **kwargs):
 
  if backend.name == 'facebook':
  try:
- profile = UnifiUser.objects.get(user=user);
+ profile = UnifiUser.objects.get(user=user)
  except UnifiUser.DoesNotExist:
  profile = UnifiUser()
- profile.user = user;
- profile.save();
+ profile.user = user
+ profile.save()
 
- profile.gender = response.get('gender');
+ profile.gender = response.get('gender')
  profile.about = response.get('about')
  profile.city = response.get('hometown')
  profile.user.email = response.get('email')
 
- birthday_date = None;
+ birthday_date = None
  try:
  birthday = response.get('birthday')
  birthday_date = datetime.strptime(birthday, '%m/%d/%Y')
  except Exception as eb:
- pass;
+ pass
  profile.dob = birthday_date
 
  fbuid = response.get('id')
  profile.user.username = fbuid # la mail e' troppo grande
- profile.user.save();
+ profile.user.save()
 
  try:
  image_name = 'fb_avatar_%s.jpg' % fbuid
@@ -93,48 +93,48 @@ def save_profile(backend, user, response, *args, **kwargs):
  ContentFile(image_stream.read()),
  )
  except Exception as e:
- pass;
+ pass
 
  # INIT - 14-12-2016
- print "FACEBOOK:seleziono lingua"
+ print("FACEBOOK:seleziono lingua")
  try:
- fb_access_token = response.get('access_token');
- fb_locale_url = "https://graph.facebook.com/v2.9/" + "/me?fields=locale,location" + "&access_token=" + fb_access_token;
- print fb_locale_url
+ fb_access_token = response.get('access_token')
+ fb_locale_url = "https://graph.facebook.com/v2.9/" + "/me?fields=locale,location" + "&access_token=" + fb_access_token
+ print(fb_locale_url)
  r = requests.get(fb_locale_url)
 
  if r.status_code == 200:
  fb_response = json.loads(str(r.text.encode("utf-8")))
- print "fb response :", fb_response
+ print("fb response :", fb_response)
 
  # language
  try:
- print "***LANG :", fb_response.get('locale')[0:2]
+ print("***LANG :", fb_response.get('locale')[0:2])
  profile.language = fb_response.get('locale')[0:2]
  except:
- pass;
+ pass
 
  # city
  try:
- print "***LOCATION :", fb_response.get('location')
+ print("***LOCATION :", fb_response.get('location'))
  profile.city = fb_response.get('location')['name']
  except:
- pass;
+ pass
 
  except Exception as e:
- print "FB Exception with locale " + str(e)
+ print("FB Exception with locale " + str(e))
  pass;
  profile.last_backend_login = backend.name;
- profile.save();
+ profile.save()
  else:
  # in questo caso sto solo richiedendo una nuova associazione social
- print "UserProfile already exist..nothing..."
+ print("UserProfile already exist..nothing...")
 
  # questo e' il caso di un utente che ha cancellato l'account
  # e' poi ritornato successivamente
- profile = UnifiUser.objects.get(user=user);
- profile.user.is_active = True;
- profile.user.save();
+ profile = UnifiUser.objects.get(user=user)
+ profile.user.is_active = True
+ profile.user.save()
 
 
 def manage_auth_already_associated(backend, uid, user=None, *args, **kwargs):

django_unifi_portal/unifi_client.py

@@ -51,7 +51,7 @@ def _get_resource_url(self, path_name=None):
  return url
  else:
  url = str.format('{0}{1}:{2}/', 'https://', self.__unifiServer, '8443')
- return url;
+ return url
 
  def _is_authorized(self, guest_mac):
  """Return true if the guest is already authorized."""
@@ -108,10 +108,10 @@ def authorize_guest(self, guest_mac, ap_mac, minutes):
  api_url = self._get_resource_url(api_version + 'cmd/stamgr')
  auth_response = self.__session.post(api_url, data=json.dumps(auth))
 
- print "***** UNIFI AUTH RESPONSE *****"
- print api_url
- print auth_response
- print "*******************************"
+ print("***** UNIFI AUTH RESPONSE *****")
+ print(api_url)
+ print(auth_response)
+ print("*******************************")
 
  return auth_response.status_code
 
@@ -142,9 +142,9 @@ def logout_from_unifi_server(self):
 
  def send_authorization(self, guest_mac, ap_mac, minutes):
  """ Login on Unifi Server and authorize a guest based on his MAC address"""
- self.login_on_unifi_server();
+ self.login_on_unifi_server()
 
- status_code = -1;
+ status_code = -1
  if not self._is_authorized(guest_mac):
  status_code = self.authorize_guest(guest_mac=guest_mac,
  minutes=minutes,