build.py file is now compatible with both Python2 and Python3 by opg7371 · Pull Request #313 · privly/privly-applications

opg7371 · 2015-12-29T20:05:14Z

issue#312 can be closed now
This build.py file is now compatible with both python2 and python3

Note that many of these functions were taken directly from the Login/js/new.js file. Only the pendingRegistration and registrationFailure functions were modified.

remove extra whitespaces

Improve first-run registration

…fferent browsers on SauceLabs using command line argument Change the filesToTest variable based on basePath Changed basePath to current working directory Made similar changes to work on SauceLabs Run SauceLabs tests on specific browsers based on command line argument Default browser for Karma is Firefox. Additional browsers can be set Improved whitespace Use BROWSERS_TO_TEST environment variable only when it is set Used === for string comparison and removed semicolon for var object

Add Safari to Unit Tests

Conflicts: test/karma.conf-ci.js test/karma.conf.js

Update chrome testing

Switched coverage reporter to coveralls

broadcast option changed message to content scripts provide read and write interface via chrome messages

…ction

…tions into MaxBorsch-develop Conflicts: shared/css/top/top.css templates/show.html.template

Rails 4.2 Support

smcgregor · 2015-12-29T20:09:11Z

Pull requests shouldn't have the built HTML (this makes it easier for me)
The built HTML is not encoded properly. You can see the newline characters rendered as \n.
You should call the make_pretty function even if the HTML is encoded as bytes. You will need to convert the bytes for this to work, which should also solve your encoding issue.

opg7371 · 2015-12-30T06:44:00Z

Hi sean please check it out.
I fixed the newline problem too...

smcgregor · 2015-12-30T19:24:34Z

Some leftover code?

opg7371 · 2016-01-03T19:41:33Z

can you tell me where exactly the work is needed..?

smcgregor · 2016-01-03T19:44:40Z

Summarize the changes you made so I don't need to look through a diff to figure out what changed. I'll look through a diff again when you have addressed the earlier comments.

opg7371 · 2016-01-03T19:55:38Z

To be clear.i need to summarize the changes i did in that build.py file itself as comments on top or some specfic position or some where else...?

smcgregor · 2016-01-03T20:19:52Z

In the comment box of GitHub. It emails me and gives me more details about the changes.

opg7371 · 2016-01-04T07:22:26Z

In the build.py file ,only the line number 70-80 are changed.
the same lines are
#The if statement is needed to maintain support for both python2 and python3
if(type(prettyHTML)==str):
#For python2 the type is String
return re.sub(r'[\ \n]{2,}</textarea>',
"</textarea>",
prettyHTML)
else:
#For python3 the type is bytes
return re.sub(r'[\ \n]{2,}</textarea>',
"</textarea>",
prettyHTML.decode('utf-8'))

smcgregor · 2016-01-04T17:25:06Z

I see why you were confused now. I am looking for a summary of the changes you made to the original pull request, not a summary of the pull request as it currently is. This makes it faster for me to re-review the pull request.

opg7371 · 2016-01-10T06:59:43Z

The changes that i made in the build.py for privly applications is made in from line 70 to 72. The problem was that the type of prettyHTML came out to be different in python2(str) and python3(bytes).So i committed the changes can be seen in line number 71 to 81.The lines changed can be seen in the above commit.

irdan · 2016-01-10T07:05:11Z

nit: remove debugging console statements

smcgregor · 2016-01-10T17:15:25Z

Your pull requests are getting mixed. You should be doing all your work on feature branches. Since you are working on two pull requests at the moment, the two branches should probably be feature-build-python-3 and feature-improve-footer. These branches should be current with the develop branch and should not share any commits between them that are not in develop. Also, your pull request should request to be merged into develop, not master.

opg7371 · 2016-02-21T20:57:24Z

Closing this issue
This issue is reopened at #349

irdan and others added 30 commits March 2, 2015 13:14

Add template changes for inline registration

8bd78b8

Add js listeners and functions for registration

aa4f646

Note that many of these functions were taken directly from the Login/js/new.js file. Only the pendingRegistration and registrationFailure functions were modified.

Add style changes for input form

e6584c8

Improve first-run registration

7b6f1a3

remove extra whitespaces

extract common template to a base template

a69b925

remove extra whitespace

f810047

Merge pull request #4 from hitesh96db/register

6db89a6

Improve first-run registration

removed html2js hack from Help tests

867305a

remove unused code

793287e

privlyLinkKey should be url encoded

9f43080

Integrated Safari with TravisCI tests

31d4ae6

added new testing options to README

9a11c2d

Merge pull request #246 from smcgregor/sammyshj-updatetest

933315d

Add Safari to Unit Tests

Merge branch 'SummerWish-fix-procesurl-bug' into develop

f7e75b3

removed html2js from all tests

f06603e

removed html2js preprocessor from Karma

c637af1

fixed callback invocation in shared functions

05e948f

Merge branch 'karma-test-cleanup' into develop

ffefbf1

Conflicts: test/karma.conf-ci.js test/karma.conf.js

fixed test in Help

b8d3a1e

updated test scripts to support multiple run_each files

3aeb030

Merge pull request #248 from smcgregor/update-chrome-testing

ef6ae3e

Update chrome testing

Switched coverage reporter to coveralls

490ced0

fixed .travis.yml file for pull requests

97ee365

Merge pull request #249 from smcgregor/switch-to-coveralls

01002a1

Switched coverage reporter to coveralls

refactor options and glyph icons

f9c93a9

fix unit test

8445a2e

improved Privly.Options

abec69f

broadcast option changed message to content scripts provide read and write interface via chrome messages

improve executing env detection: unit test in Chrome should works

c67531e

rendered HTML for web

454708c

smcgregor and others added 8 commits December 19, 2015 16:56

build HTML for web

2ca107d

switched sauce chrome version to beta because dev loses connection

dfccb89

switched Karma's sauce chrome version to beta because dev loses conne…

3ce181e

…ction

Merge branch 'develop' of https://github.com/MaxBorsch/privly-applica…

0437f7b

…tions into MaxBorsch-develop Conflicts: shared/css/top/top.css templates/show.html.template

integrated new metadata block with javascript

7317c03

Merge branch 'develop' into feature-rails-4.2

5986677

built HTML for web

57766bf

Merge pull request #309 from privly/feature-rails-4.2

511900a

Rails 4.2 Support

smcgregor reviewed Dec 30, 2015
View reviewed changes

Comment thread build.py Outdated

smcgregor Dec 30, 2015

Copy link
Copy Markdown

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some leftover code?

smcgregor added the Needs Work label Jan 2, 2016

irdan reviewed Jan 10, 2016
View reviewed changes

Comment thread PlainPost/js/show.js Outdated

irdan Jan 10, 2016

Copy link
Copy Markdown

Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: remove debugging console statements

Update

75a18c6

opg7371 mentioned this pull request Feb 21, 2016

Updated the build.py to be compatible with python3 #349

Open

opg7371 closed this Feb 21, 2016

Uh oh!

Conversation

opg7371 commented Dec 29, 2015

Uh oh!

smcgregor commented Dec 29, 2015

Uh oh!

opg7371 commented Dec 30, 2015

Uh oh!

smcgregor Dec 30, 2015

Choose a reason for hiding this comment

Uh oh!

opg7371 commented Jan 3, 2016

Uh oh!

smcgregor commented Jan 3, 2016

Uh oh!

opg7371 commented Jan 3, 2016

Uh oh!

smcgregor commented Jan 3, 2016

Uh oh!

opg7371 commented Jan 4, 2016

Uh oh!

smcgregor commented Jan 4, 2016

Uh oh!

opg7371 commented Jan 10, 2016

Uh oh!

irdan Jan 10, 2016

Choose a reason for hiding this comment

Uh oh!

smcgregor commented Jan 10, 2016

Uh oh!

opg7371 commented Feb 21, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants